diff --git a/CMakeLists.txt b/CMakeLists.txt index cbfda8b1..d3457f63 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -214,7 +214,7 @@ set (LOOT_HEADERS "${CMAKE_SOURCE_DIR}/src/backend/app/loot_paths.h" "${CMAKE_SOURCE_DIR}/src/backend/plugin/plugin_sorter.h" "${CMAKE_SOURCE_DIR}/src/backend/helpers/git_helper.h" "${CMAKE_SOURCE_DIR}/src/backend/helpers/helpers.h" - "${CMAKE_SOURCE_DIR}/src/backend/helpers/json.h" + "${CMAKE_SOURCE_DIR}/src/gui/query/json.h" "${CMAKE_SOURCE_DIR}/src/backend/helpers/language.h" "${CMAKE_SOURCE_DIR}/src/backend/helpers/version.h" "${CMAKE_SOURCE_DIR}/src/backend/helpers/yaml_set_helpers.h" diff --git a/src/gui/query/cancel_sort_query.h b/src/gui/query/cancel_sort_query.h index afe8e2cb..ce5926f2 100644 --- a/src/gui/query/cancel_sort_query.h +++ b/src/gui/query/cancel_sort_query.h @@ -26,7 +26,7 @@ along with LOOT. If not, see #define LOOT_GUI_QUERY_CANCEL_SORT_QUERY #include "backend/app/loot_state.h" -#include "backend/helpers/json.h" +#include "gui/query/json.h" #include "gui/query/metadata_query.h" namespace loot { diff --git a/src/gui/query/change_game_query.h b/src/gui/query/change_game_query.h index dea40451..d7127c09 100644 --- a/src/gui/query/change_game_query.h +++ b/src/gui/query/change_game_query.h @@ -27,7 +27,7 @@ along with LOOT. If not, see #include -#include "backend/helpers/json.h" +#include "gui/query/json.h" #include "gui/query/get_game_data_query.h" namespace loot { diff --git a/src/gui/query/clear_all_metadata_query.h b/src/gui/query/clear_all_metadata_query.h index cd056128..5dbae4c7 100644 --- a/src/gui/query/clear_all_metadata_query.h +++ b/src/gui/query/clear_all_metadata_query.h @@ -26,7 +26,7 @@ along with LOOT. If not, see #define LOOT_GUI_QUERY_CLEAR_ALL_METADATA_QUERY #include "backend/game/game.h" -#include "backend/helpers/json.h" +#include "gui/query/json.h" #include "gui/query/metadata_query.h" namespace loot { diff --git a/src/gui/query/clear_plugin_metadata_query.h b/src/gui/query/clear_plugin_metadata_query.h index c8d03a44..41e97813 100644 --- a/src/gui/query/clear_plugin_metadata_query.h +++ b/src/gui/query/clear_plugin_metadata_query.h @@ -26,7 +26,7 @@ along with LOOT. If not, see #define LOOT_GUI_QUERY_CLEAR_PLUGIN_METADATA_QUERY #include "backend/game/game.h" -#include "backend/helpers/json.h" +#include "gui/query/json.h" #include "gui/query/metadata_query.h" namespace loot { diff --git a/src/gui/query/get_conflicting_plugins_query.h b/src/gui/query/get_conflicting_plugins_query.h index 8a67a021..0449ac40 100644 --- a/src/gui/query/get_conflicting_plugins_query.h +++ b/src/gui/query/get_conflicting_plugins_query.h @@ -26,7 +26,7 @@ along with LOOT. If not, see #define LOOT_GUI_QUERY_GET_CONFLICTING_PLUGINS_QUERY #include "backend/game/game.h" -#include "backend/helpers/json.h" +#include "gui/query/json.h" #include "gui/query/metadata_query.h" namespace loot { diff --git a/src/gui/query/get_game_data_query.h b/src/gui/query/get_game_data_query.h index 0d9e93ee..144bf8aa 100644 --- a/src/gui/query/get_game_data_query.h +++ b/src/gui/query/get_game_data_query.h @@ -28,7 +28,7 @@ along with LOOT. If not, see #include #include "loot/loot_version.h" -#include "backend/helpers/json.h" +#include "gui/query/json.h" #include "backend/helpers/version.h" #include "gui/query/metadata_query.h" diff --git a/src/gui/query/get_game_types_query.h b/src/gui/query/get_game_types_query.h index 91d994c1..a94d2dc7 100644 --- a/src/gui/query/get_game_types_query.h +++ b/src/gui/query/get_game_types_query.h @@ -26,7 +26,7 @@ along with LOOT. If not, see #define LOOT_GUI_QUERY_GET_GAME_TYPES_QUERY #include "backend/game/game_settings.h" -#include "backend/helpers/json.h" +#include "gui/query/json.h" #include "gui/query/query.h" namespace loot { diff --git a/src/gui/query/get_init_errors_query.h b/src/gui/query/get_init_errors_query.h index 1af76afd..1ea0b48c 100644 --- a/src/gui/query/get_init_errors_query.h +++ b/src/gui/query/get_init_errors_query.h @@ -26,7 +26,7 @@ along with LOOT. If not, see #define LOOT_GUI_QUERY_GET_INIT_ERRORS_QUERY #include "backend/app/loot_state.h" -#include "backend/helpers/json.h" +#include "gui/query/json.h" #include "gui/query/query.h" namespace loot { diff --git a/src/gui/query/get_installed_games_query.h b/src/gui/query/get_installed_games_query.h index bb83084d..7d8b18d3 100644 --- a/src/gui/query/get_installed_games_query.h +++ b/src/gui/query/get_installed_games_query.h @@ -26,7 +26,7 @@ along with LOOT. If not, see #define LOOT_GUI_QUERY_GET_INSTALLED_GAMES_QUERY #include "backend/app/loot_state.h" -#include "backend/helpers/json.h" +#include "gui/query/json.h" #include "gui/query/query.h" namespace loot { diff --git a/src/gui/query/get_languages_query.h b/src/gui/query/get_languages_query.h index dc259364..10bcc375 100644 --- a/src/gui/query/get_languages_query.h +++ b/src/gui/query/get_languages_query.h @@ -25,7 +25,7 @@ along with LOOT. If not, see #ifndef LOOT_GUI_QUERY_GET_LANGUAGES_QUERY #define LOOT_GUI_QUERY_GET_LANGUAGES_QUERY -#include "backend/helpers/json.h" +#include "gui/query/json.h" #include "backend/helpers/language.h" #include "gui/query/query.h" diff --git a/src/gui/query/get_settings_query.h b/src/gui/query/get_settings_query.h index 0aac9fe7..ceab2db5 100644 --- a/src/gui/query/get_settings_query.h +++ b/src/gui/query/get_settings_query.h @@ -26,7 +26,7 @@ along with LOOT. If not, see #define LOOT_GUI_QUERY_GET_SETTINGS_QUERY #include "backend/app/loot_settings.h" -#include "backend/helpers/json.h" +#include "gui/query/json.h" #include "gui/query/query.h" namespace loot { diff --git a/src/gui/query/get_version_query.h b/src/gui/query/get_version_query.h index 7df31939..aa2acbe6 100644 --- a/src/gui/query/get_version_query.h +++ b/src/gui/query/get_version_query.h @@ -27,7 +27,7 @@ along with LOOT. If not, see #include "gui/query/query.h" #include "loot/loot_version.h" -#include "backend/helpers/json.h" +#include "gui/query/json.h" namespace loot { class GetVersionQuery : public Query { diff --git a/src/backend/helpers/json.h b/src/gui/query/json.h similarity index 100% rename from src/backend/helpers/json.h rename to src/gui/query/json.h diff --git a/src/gui/query/sort_plugins_query.h b/src/gui/query/sort_plugins_query.h index 9029e496..9e569404 100644 --- a/src/gui/query/sort_plugins_query.h +++ b/src/gui/query/sort_plugins_query.h @@ -28,7 +28,7 @@ along with LOOT. If not, see #include #include "backend/app/loot_state.h" -#include "backend/helpers/json.h" +#include "gui/query/json.h" #include "backend/plugin/plugin_sorter.h" #include "loot/exception/cyclic_interaction_error.h" #include "gui/query/metadata_query.h" diff --git a/src/gui/query/update_masterlist_query.h b/src/gui/query/update_masterlist_query.h index 76468d28..302498d1 100644 --- a/src/gui/query/update_masterlist_query.h +++ b/src/gui/query/update_masterlist_query.h @@ -26,7 +26,7 @@ along with LOOT. If not, see #define LOOT_GUI_QUERY_UPDATE_MASTERLIST_QUERY #include "backend/game/game.h" -#include "backend/helpers/json.h" +#include "gui/query/json.h" #include "gui/query/metadata_query.h" namespace loot { diff --git a/src/gui/query_handler.cpp b/src/gui/query_handler.cpp index 5b4b4c9b..a445a40b 100644 --- a/src/gui/query_handler.cpp +++ b/src/gui/query_handler.cpp @@ -73,7 +73,7 @@ #include "backend/app/loot_paths.h" #include "backend/plugin/plugin_sorter.h" #include "backend/helpers/helpers.h" -#include "backend/helpers/json.h" +#include "gui/query/json.h" #include "backend/helpers/version.h" #include "loot/loot_version.h"