Include refactoring

10 files changed, 11 insertions, 2 deletions

diff --git a/src/plugins/FileManager.cpp b/src/plugins/FileManager.cpp
index 289a382..a92f3c1 100644
--- a/src/plugins/FileManager.cpp
+++ b/src/plugins/FileManager.cpp
@@ -2,6 +2,7 @@
 #include "../../include/FileAnalyzer.hpp"
 #include "../../include/ResourceLoader.hpp"
 #include "../../include/Theme.hpp"
+#include "../../include/Storage.hpp"
 #include "../../include/QuickMedia.hpp"
 
 namespace QuickMedia {
diff --git a/src/plugins/Info.cpp b/src/plugins/Info.cpp
index a68033f..b488eba 100644
--- a/src/plugins/Info.cpp
+++ b/src/plugins/Info.cpp
@@ -4,6 +4,7 @@
 #include "../../include/StringUtils.hpp"
 #include "../../include/Program.hpp"
 #include "../../include/Notification.hpp"
+#include "../../include/Storage.hpp"
 
 namespace QuickMedia {
     static const char *REVERSE_IMAGE_SEARCH_URL = "reverse-image-search://";
diff --git a/src/plugins/MangaGeneric.cpp b/src/plugins/MangaGeneric.cpp
index 78a2c39..98dc708 100644
--- a/src/plugins/MangaGeneric.cpp
+++ b/src/plugins/MangaGeneric.cpp
@@ -2,6 +2,7 @@
 #include "../../include/StringUtils.hpp"
 #include "../../include/Theme.hpp"
 #include <quickmedia/HtmlSearch.h>
+#include <json/value.h>
 #include <assert.h>
 
 namespace QuickMedia {
diff --git a/src/plugins/Manganelo.cpp b/src/plugins/Manganelo.cpp
index 990a513..df86207 100644
--- a/src/plugins/Manganelo.cpp
+++ b/src/plugins/Manganelo.cpp
@@ -3,6 +3,7 @@
 #include "../../include/NetUtils.hpp"
 #include "../../include/Theme.hpp"
 #include <quickmedia/HtmlSearch.h>
+#include <json/value.h>
 
 namespace QuickMedia {
     static bool string_view_contains(const QuickMediaStringView str, const char *sub) {
diff --git a/src/plugins/Matrix.cpp b/src/plugins/Matrix.cpp
index 3f42437..13fd230 100644
--- a/src/plugins/Matrix.cpp
+++ b/src/plugins/Matrix.cpp
@@ -3817,8 +3817,8 @@ namespace QuickMedia {
         remove(matrix_sync_data_path.data.c_str());
         Path filter_cache_path = get_storage_dir().join("matrix").join("filter");
         remove(filter_cache_path.data.c_str());
-        for_files_in_dir(get_cache_dir().join("matrix").join("events"), [](const std::filesystem::path &filepath) {
-            remove(filepath.c_str());
+        for_files_in_dir(get_cache_dir().join("matrix").join("events"), [](const Path &filepath) {
+            remove(filepath.data.c_str());
             return true;
         });
 
diff --git a/src/plugins/MyAnimeList.cpp b/src/plugins/MyAnimeList.cpp
index 16f07f9..ceba73a 100644
--- a/src/plugins/MyAnimeList.cpp
+++ b/src/plugins/MyAnimeList.cpp
@@ -3,6 +3,7 @@
 #include "../../include/NetUtils.hpp"
 #include "../../include/StringUtils.hpp"
 #include <quickmedia/HtmlSearch.h>
+#include <json/value.h>
 
 namespace QuickMedia {
     // Returns {0, 0} if unknown
diff --git a/src/plugins/Page.cpp b/src/plugins/Page.cpp
index 5ce86e6..935d214 100644
--- a/src/plugins/Page.cpp
+++ b/src/plugins/Page.cpp
@@ -1,6 +1,7 @@
 #include "../../plugins/Page.hpp"
 #include "../../include/StringUtils.hpp"
 #include "../../include/Theme.hpp"
+#include "../../include/Storage.hpp"
 #include "../../include/QuickMedia.hpp"
 #include <json/reader.h>
 
diff --git a/src/plugins/Peertube.cpp b/src/plugins/Peertube.cpp
index db55584..dd789d4 100644
--- a/src/plugins/Peertube.cpp
+++ b/src/plugins/Peertube.cpp
@@ -3,6 +3,7 @@
 #include "../../include/Notification.hpp"
 #include "../../include/Utils.hpp"
 #include "../../include/StringUtils.hpp"
+#include <json/value.h>
 
 namespace QuickMedia {
     static const char* search_type_to_string(PeertubeSearchPage::SearchType search_type) {
diff --git a/src/plugins/Soundcloud.cpp b/src/plugins/Soundcloud.cpp
index 3a9a6e1..d54060d 100644
--- a/src/plugins/Soundcloud.cpp
+++ b/src/plugins/Soundcloud.cpp
@@ -5,6 +5,7 @@
 #include "../../include/Scale.hpp"
 #include "../../include/Theme.hpp"
 #include <quickmedia/HtmlSearch.h>
+#include <json/value.h>
 
 namespace QuickMedia {
     static std::string client_id;
diff --git a/src/plugins/Youtube.cpp b/src/plugins/Youtube.cpp
index a258325..0316c6f 100644
--- a/src/plugins/Youtube.cpp
+++ b/src/plugins/Youtube.cpp
@@ -8,6 +8,7 @@
 #include "../../include/VideoPlayer.hpp"
 #include "../../include/Utils.hpp"
 #include "../../include/Theme.hpp"
+#include <optional>
 #include <json/reader.h>
 extern "C" {
 #include <HtmlParser.h>