From 0d2b498e558509776fb78618fd2f521ebab7ee3f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Thu, 6 Nov 2025 21:10:23 +0100 Subject: [PATCH] More includes that slipped past. Took 3 minutes --- cockatrice/src/client/settings/card_counter_settings.h | 3 +-- cockatrice/src/game/deckview/deck_view_container.cpp | 2 +- cockatrice/src/game/zones/hand_zone.cpp | 2 +- cockatrice/src/game/zones/stack_zone.cpp | 2 +- cockatrice/src/game/zones/table_zone.cpp | 2 +- cockatrice/src/game/zones/view_zone_widget.cpp | 2 +- .../src/interface/card_picture_loader/card_picture_loader.cpp | 3 ++- .../card_picture_loader/card_picture_loader_local.cpp | 2 +- .../card_picture_loader/card_picture_loader_worker.cpp | 2 +- .../card_picture_loader/card_picture_loader_worker_work.cpp | 2 +- .../src/interface/card_picture_loader/card_picture_to_load.cpp | 3 ++- cockatrice/src/interface/window_main.cpp | 2 +- 12 files changed, 14 insertions(+), 13 deletions(-) diff --git a/cockatrice/src/client/settings/card_counter_settings.h b/cockatrice/src/client/settings/card_counter_settings.h index dbf524873..f2c1c1d43 100644 --- a/cockatrice/src/client/settings/card_counter_settings.h +++ b/cockatrice/src/client/settings/card_counter_settings.h @@ -7,9 +7,8 @@ #ifndef CARD_COUNTER_SETTINGS_H #define CARD_COUNTER_SETTINGS_H -#include "../../../../libcockatrice_settings/libcockatrice/settings/settings_manager.h" - #include +#include class QSettings; class QColor; diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index c67d3af8d..abf51b3c3 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -1,5 +1,6 @@ #include "deck_view_container.h" +#include "../../client/settings/cache_settings.h" #include "../../interface/card_picture_loader/card_picture_loader.h" #include "../../interface/widgets/dialogs/dlg_load_deck.h" #include "../../interface/widgets/dialogs/dlg_load_deck_from_clipboard.h" @@ -9,7 +10,6 @@ #include "../game_scene.h" #include "deck_view.h" -#include <../../client/settings/cache_settings.h> #include #include #include diff --git a/cockatrice/src/game/zones/hand_zone.cpp b/cockatrice/src/game/zones/hand_zone.cpp index 514090bd2..15a6ba6b0 100644 --- a/cockatrice/src/game/zones/hand_zone.cpp +++ b/cockatrice/src/game/zones/hand_zone.cpp @@ -1,11 +1,11 @@ #include "hand_zone.h" +#include "../../client/settings/cache_settings.h" #include "../../interface/theme_manager.h" #include "../board/card_drag_item.h" #include "../board/card_item.h" #include "../player/player.h" -#include <../../client/settings/cache_settings.h> #include #include diff --git a/cockatrice/src/game/zones/stack_zone.cpp b/cockatrice/src/game/zones/stack_zone.cpp index 0a67955bd..0c0501705 100644 --- a/cockatrice/src/game/zones/stack_zone.cpp +++ b/cockatrice/src/game/zones/stack_zone.cpp @@ -1,5 +1,6 @@ #include "stack_zone.h" +#include "../../client/settings/cache_settings.h" #include "../../interface/theme_manager.h" #include "../board/arrow_item.h" #include "../board/card_drag_item.h" @@ -7,7 +8,6 @@ #include "../player/player.h" #include "logic/stack_zone_logic.h" -#include <../../client/settings/cache_settings.h> #include #include #include diff --git a/cockatrice/src/game/zones/table_zone.cpp b/cockatrice/src/game/zones/table_zone.cpp index e63123f52..a51550506 100644 --- a/cockatrice/src/game/zones/table_zone.cpp +++ b/cockatrice/src/game/zones/table_zone.cpp @@ -1,5 +1,6 @@ #include "table_zone.h" +#include "../../client/settings/cache_settings.h" #include "../../interface/theme_manager.h" #include "../board/arrow_item.h" #include "../board/card_drag_item.h" @@ -7,7 +8,6 @@ #include "../player/player.h" #include "logic/table_zone_logic.h" -#include <../../client/settings/cache_settings.h> #include #include #include diff --git a/cockatrice/src/game/zones/view_zone_widget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp index 29c1afa76..9dbb16247 100644 --- a/cockatrice/src/game/zones/view_zone_widget.cpp +++ b/cockatrice/src/game/zones/view_zone_widget.cpp @@ -1,5 +1,6 @@ #include "view_zone_widget.h" +#include "../../client/settings/cache_settings.h" #include "../../filters/syntax_help.h" #include "../../interface/pixel_map_generator.h" #include "../board/card_item.h" @@ -7,7 +8,6 @@ #include "../player/player.h" #include "view_zone.h" -#include <../../client/settings/cache_settings.h> #include #include #include diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp index f95c49d08..ce6005b74 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp @@ -1,6 +1,7 @@ #include "card_picture_loader.h" -#include <../../client/settings/cache_settings.h> +#include "../../client/settings/cache_settings.h" + #include #include #include diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp index d21a33009..d200bc0a2 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_local.cpp @@ -1,8 +1,8 @@ #include "card_picture_loader_local.h" +#include "../../client/settings/cache_settings.h" #include "card_picture_to_load.h" -#include <../../client/settings/cache_settings.h> #include #include #include diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp index 2dba63e4a..3deea4e60 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker.cpp @@ -1,9 +1,9 @@ #include "card_picture_loader_worker.h" +#include "../../client/settings/cache_settings.h" #include "card_picture_loader_local.h" #include "card_picture_loader_worker_work.h" -#include <../../client/settings/cache_settings.h> #include #include #include diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp index 3a640955a..29097517e 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader_worker_work.cpp @@ -1,8 +1,8 @@ #include "card_picture_loader_worker_work.h" +#include "../../client/settings/cache_settings.h" #include "card_picture_loader_worker.h" -#include <../../client/settings/cache_settings.h> #include #include #include diff --git a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp index 4e7e50048..90cbe154a 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_to_load.cpp @@ -1,6 +1,7 @@ #include "card_picture_to_load.h" -#include <../../client/settings/cache_settings.h> +#include "../../client/settings/cache_settings.h" + #include #include #include diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp index 670d9a0f1..639ab1f98 100644 --- a/cockatrice/src/interface/window_main.cpp +++ b/cockatrice/src/interface/window_main.cpp @@ -21,6 +21,7 @@ #include "../client/network/update/client/client_update_checker.h" #include "../client/network/update/client/release_channel.h" +#include "../client/settings/cache_settings.h" #include "../interface/widgets/dialogs/dlg_connect.h" #include "../interface/widgets/dialogs/dlg_edit_tokens.h" #include "../interface/widgets/dialogs/dlg_forgot_password_challenge.h" @@ -40,7 +41,6 @@ #include "version_string.h" #include "widgets/utility/get_text_with_max.h" -#include <../client/settings/cache_settings.h> #include #include #include