From 12a2d27dfdd36bd6f23800da59b9ddded610c179 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Tue, 4 Nov 2025 18:50:16 +0100 Subject: [PATCH] Move settings cache and settings card preference provider out of libcockatrice_settings and into cockatrice Took 52 minutes Took 9 minutes Took 1 minute --- cockatrice/CMakeLists.txt | 2 ++ .../spoiler_background_updater.cpp | 2 +- .../update/client/client_update_checker.cpp | 3 +-- .../src/client}/settings/cache_settings.cpp | 6 +++--- .../src/client}/settings/cache_settings.h | 20 +++++++++---------- .../client}/settings/shortcut_treeview.cpp | 2 +- .../src/client}/settings/shortcut_treeview.h | 0 cockatrice/src/client/sound_engine.cpp | 3 ++- .../settings_card_preference_provider.h | 5 +++-- .../game/board/abstract_card_drag_item.cpp | 3 ++- .../src/game/board/abstract_card_item.cpp | 1 - .../src/game/board/abstract_counter.cpp | 2 +- cockatrice/src/game/board/arrow_item.cpp | 2 +- cockatrice/src/game/board/card_item.cpp | 2 +- cockatrice/src/game/deckview/deck_view.cpp | 2 +- .../src/game/deckview/deck_view_container.cpp | 2 +- .../src/game/dialogs/dlg_create_token.cpp | 2 +- cockatrice/src/game/game_scene.cpp | 2 +- cockatrice/src/game/game_view.cpp | 2 +- cockatrice/src/game/player/menu/hand_menu.cpp | 2 +- .../src/game/player/menu/library_menu.cpp | 2 +- cockatrice/src/game/player/menu/say_menu.cpp | 3 +-- cockatrice/src/game/zones/hand_zone.cpp | 2 +- .../src/game/zones/logic/view_zone_logic.cpp | 3 +-- cockatrice/src/game/zones/select_zone.cpp | 2 +- cockatrice/src/game/zones/stack_zone.cpp | 2 +- cockatrice/src/game/zones/table_zone.cpp | 2 +- .../src/game/zones/view_zone_widget.cpp | 2 +- .../card_picture_loader.cpp | 2 +- .../card_picture_loader_local.cpp | 2 +- .../card_picture_loader_worker.cpp | 2 +- .../card_picture_loader_worker_work.cpp | 2 +- .../card_picture_to_load.cpp | 2 +- cockatrice/src/interface/theme_manager.cpp | 3 ++- .../additional_info/color_identity_widget.cpp | 2 +- .../additional_info/mana_symbol_widget.cpp | 3 ++- .../widgets/cards/card_info_frame_widget.cpp | 2 +- .../card_info_picture_enlarged_widget.cpp | 2 +- .../cards/card_info_picture_widget.cpp | 2 +- .../widgets/cards/card_size_widget.cpp | 3 +-- .../deck_preview_card_picture_widget.cpp | 3 ++- .../deck_editor_database_display_widget.cpp | 2 +- .../deck_editor_deck_dock_widget.cpp | 3 ++- .../deck_editor_filter_dock_widget.cpp | 2 +- .../interface/widgets/dialogs/dlg_connect.cpp | 3 ++- .../widgets/dialogs/dlg_create_game.cpp | 2 +- .../dialogs/dlg_default_tags_editor.cpp | 3 ++- .../widgets/dialogs/dlg_edit_password.cpp | 3 ++- .../widgets/dialogs/dlg_edit_user.cpp | 3 ++- .../dialogs/dlg_forgot_password_challenge.cpp | 3 ++- .../dialogs/dlg_forgot_password_request.cpp | 3 ++- .../dialogs/dlg_forgot_password_reset.cpp | 3 ++- .../widgets/dialogs/dlg_load_deck.cpp | 3 ++- .../dialogs/dlg_load_deck_from_clipboard.cpp | 2 +- .../widgets/dialogs/dlg_manage_sets.cpp | 2 +- .../widgets/dialogs/dlg_register.cpp | 3 ++- .../widgets/dialogs/dlg_settings.cpp | 4 ++-- .../dialogs/dlg_startup_card_check.cpp | 3 ++- .../widgets/dialogs/dlg_tip_of_the_day.cpp | 2 +- .../interface/widgets/dialogs/dlg_update.cpp | 2 +- .../widgets/dialogs/dlg_view_log.cpp | 3 ++- .../interface/widgets/general/home_widget.cpp | 2 +- .../widgets/menus/deck_editor_menu.cpp | 3 ++- .../interface/widgets/menus/tearoff_menu.h | 3 ++- .../printing_selector/printing_selector.cpp | 2 +- .../printing_selector_card_overlay_widget.cpp | 2 +- .../printing_selector_card_sorting_widget.cpp | 3 ++- .../widgets/replay/replay_timeline_widget.cpp | 3 ++- .../widgets/server/chat_view/chat_view.cpp | 2 +- .../interface/widgets/server/games_model.cpp | 2 +- .../widgets/server/handle_public_servers.cpp | 3 ++- .../server/user/user_info_connection.cpp | 3 ++- .../widgets/tabs/abstract_tab_deck_editor.cpp | 2 +- .../widgets/tabs/tab_deck_editor.cpp | 2 +- .../widgets/tabs/tab_deck_storage.cpp | 2 +- .../src/interface/widgets/tabs/tab_game.cpp | 2 +- .../interface/widgets/tabs/tab_message.cpp | 2 +- .../interface/widgets/tabs/tab_replays.cpp | 2 +- .../src/interface/widgets/tabs/tab_room.cpp | 2 +- .../interface/widgets/tabs/tab_supervisor.cpp | 2 +- .../tab_deck_editor_visual.cpp | 2 +- .../widgets/utility/custom_line_edit.cpp | 3 ++- .../widgets/utility/sequence_edit.cpp | 3 ++- ...tabase_display_filter_save_load_widget.cpp | 2 +- ...ual_database_display_set_filter_widget.cpp | 2 +- .../visual_database_display_widget.cpp | 2 +- .../visual_database_filter_display_widget.cpp | 3 ++- .../visual_deck_editor_sample_hand_widget.cpp | 2 +- .../deck_preview_deck_tags_display_widget.cpp | 2 +- .../deck_preview_tag_addition_widget.cpp | 2 +- .../deck_preview/deck_preview_tag_dialog.cpp | 2 +- .../deck_preview/deck_preview_widget.cpp | 2 +- ...ual_deck_storage_folder_display_widget.cpp | 2 +- ...ual_deck_storage_quick_settings_widget.cpp | 2 +- .../visual_deck_storage_search_widget.cpp | 2 +- .../visual_deck_storage_sort_widget.cpp | 2 +- .../visual_deck_storage_widget.cpp | 2 +- cockatrice/src/interface/window_main.cpp | 2 +- cockatrice/src/main.cpp | 5 ++++- dbconverter/src/mocks.h | 2 +- libcockatrice_card/CMakeLists.txt | 2 ++ .../libcockatrice/card/card_info.cpp | 2 +- .../card/database/card_database.cpp | 2 +- .../card/database/card_database_loader.cpp | 2 +- .../card/database/card_database_manager.cpp | 11 ++++++++-- .../card/database/card_database_manager.h | 4 ++++ .../card/database/card_database_querier.cpp | 2 +- .../card/database/card_database_querier.h | 2 +- .../interface_card_preference_provider.h | 0 .../interface/noop_card_preference_provider.h | 0 .../card/database/parser/cockatrice_xml_4.cpp | 4 ++-- .../libcockatrice/card/set/card_set.cpp | 2 +- .../models/deck_list/deck_list_model.cpp | 1 - .../network/client/remote/remote_client.cpp | 2 +- libcockatrice_settings/CMakeLists.txt | 4 ---- oracle/src/main.cpp | 2 +- oracle/src/oraclewizard.cpp | 2 +- tests/carddatabase/mocks.h | 2 +- 118 files changed, 169 insertions(+), 134 deletions(-) rename {libcockatrice_settings/libcockatrice => cockatrice/src/client}/settings/cache_settings.cpp (99%) rename {libcockatrice_settings/libcockatrice => cockatrice/src/client}/settings/cache_settings.h (97%) rename {libcockatrice_settings/libcockatrice => cockatrice/src/client}/settings/shortcut_treeview.cpp (98%) rename {libcockatrice_settings/libcockatrice => cockatrice/src/client}/settings/shortcut_treeview.h (100%) rename {cockatrice/src => libcockatrice_card/libcockatrice/card}/database/interface/interface_card_preference_provider.h (100%) rename {cockatrice/src => libcockatrice_card/libcockatrice/card}/database/interface/noop_card_preference_provider.h (100%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 9eed16ff7..88597d9ad 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -15,6 +15,8 @@ set(cockatrice_SOURCES src/client/network/update/client/release_channel.cpp src/client/network/update/card_spoiler/spoiler_background_updater.cpp src/client/sound_engine.cpp + src/client/settings/cache_settings.cpp + src/client/settings/shortcut_treeview.cpp src/interface/widgets/dialogs/dlg_connect.cpp src/interface/widgets/dialogs/dlg_convert_deck_to_cod_format.cpp src/interface/widgets/dialogs/dlg_create_game.cpp diff --git a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp index 7dce6a65c..cfd4cbbf8 100644 --- a/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp +++ b/cockatrice/src/client/network/update/card_spoiler/spoiler_background_updater.cpp @@ -2,6 +2,7 @@ #include "../../../../interface/window_main.h" #include "../../../../main.h" +#include "../../../settings/cache_settings.h" #include #include @@ -15,7 +16,6 @@ #include #include #include -#include #define SPOILERS_STATUS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/SpoilerSeasonEnabled" #define SPOILERS_URL "https://raw.githubusercontent.com/Cockatrice/Magic-Spoiler/files/spoiler.xml" diff --git a/cockatrice/src/client/network/update/client/client_update_checker.cpp b/cockatrice/src/client/network/update/client/client_update_checker.cpp index f965ff6dc..64709113a 100644 --- a/cockatrice/src/client/network/update/client/client_update_checker.cpp +++ b/cockatrice/src/client/network/update/client/client_update_checker.cpp @@ -1,9 +1,8 @@ #include "client_update_checker.h" +#include "../../../settings/cache_settings.h" #include "release_channel.h" -#include - ClientUpdateChecker::ClientUpdateChecker(QObject *parent) : QObject(parent) { } diff --git a/libcockatrice_settings/libcockatrice/settings/cache_settings.cpp b/cockatrice/src/client/settings/cache_settings.cpp similarity index 99% rename from libcockatrice_settings/libcockatrice/settings/cache_settings.cpp rename to cockatrice/src/client/settings/cache_settings.cpp index f730877d1..161bdf31d 100644 --- a/libcockatrice_settings/libcockatrice/settings/cache_settings.cpp +++ b/cockatrice/src/client/settings/cache_settings.cpp @@ -1,8 +1,8 @@ #include "cache_settings.h" -#include "../../../cockatrice/src/client/network/update/client/release_channel.h" -#include "card_counter_settings.h" -#include "card_override_settings.h" +#include "../../../../libcockatrice_settings/libcockatrice/settings/card_counter_settings.h" +#include "../../../../libcockatrice_settings/libcockatrice/settings/card_override_settings.h" +#include "../network/update/client/release_channel.h" #include #include diff --git a/libcockatrice_settings/libcockatrice/settings/cache_settings.h b/cockatrice/src/client/settings/cache_settings.h similarity index 97% rename from libcockatrice_settings/libcockatrice/settings/cache_settings.h rename to cockatrice/src/client/settings/cache_settings.h index 90eba0cb1..9c078d7e6 100644 --- a/libcockatrice_settings/libcockatrice/settings/cache_settings.h +++ b/cockatrice/src/client/settings/cache_settings.h @@ -7,16 +7,16 @@ #ifndef SETTINGSCACHE_H #define SETTINGSCACHE_H -#include "card_database_settings.h" -#include "card_override_settings.h" -#include "debug_settings.h" -#include "download_settings.h" -#include "game_filters_settings.h" -#include "layouts_settings.h" -#include "message_settings.h" -#include "recents_settings.h" -#include "servers_settings.h" -#include "shortcuts_settings.h" +#include "../../../../libcockatrice_settings/libcockatrice/settings/card_database_settings.h" +#include "../../../../libcockatrice_settings/libcockatrice/settings/card_override_settings.h" +#include "../../../../libcockatrice_settings/libcockatrice/settings/debug_settings.h" +#include "../../../../libcockatrice_settings/libcockatrice/settings/download_settings.h" +#include "../../../../libcockatrice_settings/libcockatrice/settings/game_filters_settings.h" +#include "../../../../libcockatrice_settings/libcockatrice/settings/layouts_settings.h" +#include "../../../../libcockatrice_settings/libcockatrice/settings/message_settings.h" +#include "../../../../libcockatrice_settings/libcockatrice/settings/recents_settings.h" +#include "../../../../libcockatrice_settings/libcockatrice/settings/servers_settings.h" +#include "../../../../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" #include #include diff --git a/libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp b/cockatrice/src/client/settings/shortcut_treeview.cpp similarity index 98% rename from libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp rename to cockatrice/src/client/settings/shortcut_treeview.cpp index 6b329b23d..387b684c1 100644 --- a/libcockatrice_settings/libcockatrice/settings/shortcut_treeview.cpp +++ b/cockatrice/src/client/settings/shortcut_treeview.cpp @@ -1,7 +1,7 @@ #include "shortcut_treeview.h" +#include "../../../../libcockatrice_settings/libcockatrice/settings/shortcuts_settings.h" #include "cache_settings.h" -#include "shortcuts_settings.h" #include diff --git a/libcockatrice_settings/libcockatrice/settings/shortcut_treeview.h b/cockatrice/src/client/settings/shortcut_treeview.h similarity index 100% rename from libcockatrice_settings/libcockatrice/settings/shortcut_treeview.h rename to cockatrice/src/client/settings/shortcut_treeview.h diff --git a/cockatrice/src/client/sound_engine.cpp b/cockatrice/src/client/sound_engine.cpp index 05f2d12d8..31cb2a35e 100644 --- a/cockatrice/src/client/sound_engine.cpp +++ b/cockatrice/src/client/sound_engine.cpp @@ -1,8 +1,9 @@ #include "sound_engine.h" +#include "settings/cache_settings.h" + #include #include -#include #if (QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)) #include diff --git a/cockatrice/src/database/interface/settings_card_preference_provider.h b/cockatrice/src/database/interface/settings_card_preference_provider.h index fa1ff04f4..198a4598b 100644 --- a/cockatrice/src/database/interface/settings_card_preference_provider.h +++ b/cockatrice/src/database/interface/settings_card_preference_provider.h @@ -1,7 +1,8 @@ #ifndef COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H #define COCKATRICE_SETTINGS_CARD_PREFERENCE_PROVIDER_H -#include "../../settings/cache_settings.h" -#include "interface_card_preference_provider.h" +#include "../../client/settings/cache_settings.h" + +#include class SettingsCardPreferenceProvider : public ICardPreferenceProvider { diff --git a/cockatrice/src/game/board/abstract_card_drag_item.cpp b/cockatrice/src/game/board/abstract_card_drag_item.cpp index 3507a5a27..c961cbcb6 100644 --- a/cockatrice/src/game/board/abstract_card_drag_item.cpp +++ b/cockatrice/src/game/board/abstract_card_drag_item.cpp @@ -1,10 +1,11 @@ #include "abstract_card_drag_item.h" +#include "../../client/settings/cache_settings.h" + #include #include #include #include -#include static const float CARD_WIDTH_HALF = CARD_WIDTH / 2; static const float CARD_HEIGHT_HALF = CARD_HEIGHT / 2; diff --git a/cockatrice/src/game/board/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp index 2b3811b53..326e4c9ef 100644 --- a/cockatrice/src/game/board/abstract_card_item.cpp +++ b/cockatrice/src/game/board/abstract_card_item.cpp @@ -10,7 +10,6 @@ #include #include #include -#include AbstractCardItem::AbstractCardItem(QGraphicsItem *parent, const CardRef &cardRef, Player *_owner, int _id) : ArrowTarget(_owner, parent), id(_id), cardRef(cardRef), tapped(false), facedown(false), tapAngle(0), diff --git a/cockatrice/src/game/board/abstract_counter.cpp b/cockatrice/src/game/board/abstract_counter.cpp index 44340cc34..8ca593ace 100644 --- a/cockatrice/src/game/board/abstract_counter.cpp +++ b/cockatrice/src/game/board/abstract_counter.cpp @@ -1,5 +1,6 @@ #include "abstract_counter.h" +#include "../../client/settings/cache_settings.h" #include "../../interface/widgets/tabs/tab_game.h" #include "../player/player.h" #include "translate_counter_name.h" @@ -14,7 +15,6 @@ #include #include #include -#include #include AbstractCounter::AbstractCounter(Player *_player, diff --git a/cockatrice/src/game/board/arrow_item.cpp b/cockatrice/src/game/board/arrow_item.cpp index cc4a4e6aa..fd044d042 100644 --- a/cockatrice/src/game/board/arrow_item.cpp +++ b/cockatrice/src/game/board/arrow_item.cpp @@ -1,6 +1,7 @@ #define _USE_MATH_DEFINES #include "arrow_item.h" +#include "../../client/settings/cache_settings.h" #include "../player/player.h" #include "../player/player_target.h" #include "../zones/card_zone.h" @@ -15,7 +16,6 @@ #include #include #include -#include #include ArrowItem::ArrowItem(Player *_player, int _id, ArrowTarget *_startItem, ArrowTarget *_targetItem, const QColor &_color) diff --git a/cockatrice/src/game/board/card_item.cpp b/cockatrice/src/game/board/card_item.cpp index 64f905fee..5e7cd9b49 100644 --- a/cockatrice/src/game/board/card_item.cpp +++ b/cockatrice/src/game/board/card_item.cpp @@ -1,5 +1,6 @@ #include "card_item.h" +#include "../../client/settings/cache_settings.h" #include "../../interface/widgets/tabs/tab_game.h" #include "../game_scene.h" #include "../player/player.h" @@ -16,7 +17,6 @@ #include #include #include -#include #include CardItem::CardItem(Player *_owner, QGraphicsItem *parent, const CardRef &cardRef, int _cardid, CardZoneLogic *_zone) diff --git a/cockatrice/src/game/deckview/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp index da9c97db9..6c5e51fc4 100644 --- a/cockatrice/src/game/deckview/deck_view.cpp +++ b/cockatrice/src/game/deckview/deck_view.cpp @@ -1,5 +1,6 @@ #include "deck_view.h" +#include "../../client/settings/cache_settings.h" #include "../../interface/theme_manager.h" #include @@ -10,7 +11,6 @@ #include #include #include -#include DeckViewCardDragItem::DeckViewCardDragItem(DeckViewCard *_item, const QPointF &_hotSpot, diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index fc1c569b5..fa5b338a5 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -9,6 +9,7 @@ #include "../game_scene.h" #include "deck_view.h" +#include <../../client/settings/cache_settings.h> #include #include #include @@ -22,7 +23,6 @@ #include #include #include -#include #include ToggleButton::ToggleButton(QWidget *parent) : QPushButton(parent), state(false) diff --git a/cockatrice/src/game/dialogs/dlg_create_token.cpp b/cockatrice/src/game/dialogs/dlg_create_token.cpp index c4898b910..7cafc3219 100644 --- a/cockatrice/src/game/dialogs/dlg_create_token.cpp +++ b/cockatrice/src/game/dialogs/dlg_create_token.cpp @@ -1,5 +1,6 @@ #include "dlg_create_token.h" +#include "../../client/settings/cache_settings.h" #include "../../interface/widgets/cards/card_info_picture_widget.h" #include "../../main.h" @@ -20,7 +21,6 @@ #include #include #include -#include #include DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *parent) diff --git a/cockatrice/src/game/game_scene.cpp b/cockatrice/src/game/game_scene.cpp index 5af7b2e1d..2175f4aa2 100644 --- a/cockatrice/src/game/game_scene.cpp +++ b/cockatrice/src/game/game_scene.cpp @@ -1,5 +1,6 @@ #include "game_scene.h" +#include "../client/settings/cache_settings.h" #include "board/card_item.h" #include "phases_toolbar.h" #include "player/player.h" @@ -14,7 +15,6 @@ #include #include #include -#include #include /** diff --git a/cockatrice/src/game/game_view.cpp b/cockatrice/src/game/game_view.cpp index 607f0c85a..dd5cc70c1 100644 --- a/cockatrice/src/game/game_view.cpp +++ b/cockatrice/src/game/game_view.cpp @@ -1,11 +1,11 @@ #include "game_view.h" +#include "../client/settings/cache_settings.h" #include "game_scene.h" #include #include #include -#include GameView::GameView(GameScene *scene, QWidget *parent) : QGraphicsView(scene, parent), rubberBand(0) { diff --git a/cockatrice/src/game/player/menu/hand_menu.cpp b/cockatrice/src/game/player/menu/hand_menu.cpp index b8908bc3e..65f6d0ef4 100644 --- a/cockatrice/src/game/player/menu/hand_menu.cpp +++ b/cockatrice/src/game/player/menu/hand_menu.cpp @@ -1,5 +1,6 @@ #include "hand_menu.h" +#include "../../../client/settings/cache_settings.h" #include "../../abstract_game.h" #include "../../zones/hand_zone.h" #include "../player.h" @@ -7,7 +8,6 @@ #include #include -#include #include HandMenu::HandMenu(Player *_player, PlayerActions *actions, QWidget *parent) : TearOffMenu(parent), player(_player) diff --git a/cockatrice/src/game/player/menu/library_menu.cpp b/cockatrice/src/game/player/menu/library_menu.cpp index 4303a6540..d39dbc747 100644 --- a/cockatrice/src/game/player/menu/library_menu.cpp +++ b/cockatrice/src/game/player/menu/library_menu.cpp @@ -1,5 +1,6 @@ #include "library_menu.h" +#include "../../../client/settings/cache_settings.h" #include "../../../interface/widgets/tabs/tab_game.h" #include "../../abstract_game.h" #include "../player.h" @@ -7,7 +8,6 @@ #include #include -#include #include LibraryMenu::LibraryMenu(Player *_player, QWidget *parent) : TearOffMenu(parent), player(_player) diff --git a/cockatrice/src/game/player/menu/say_menu.cpp b/cockatrice/src/game/player/menu/say_menu.cpp index 7db8f60be..3c4802aa5 100644 --- a/cockatrice/src/game/player/menu/say_menu.cpp +++ b/cockatrice/src/game/player/menu/say_menu.cpp @@ -1,10 +1,9 @@ #include "say_menu.h" +#include "../../../client/settings/cache_settings.h" #include "../player.h" #include "../player_actions.h" -#include - SayMenu::SayMenu(Player *_player) : player(_player) { connect(&SettingsCache::instance().messages(), &MessageSettings::messageMacrosChanged, this, &SayMenu::initSayMenu); diff --git a/cockatrice/src/game/zones/hand_zone.cpp b/cockatrice/src/game/zones/hand_zone.cpp index 5d63e8a28..1ae8b0476 100644 --- a/cockatrice/src/game/zones/hand_zone.cpp +++ b/cockatrice/src/game/zones/hand_zone.cpp @@ -5,9 +5,9 @@ #include "../board/card_item.h" #include "../player/player.h" +#include <../../client/settings/cache_settings.h> #include #include -#include HandZone::HandZone(HandZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent) : SelectZone(_logic, parent), zoneHeight(_zoneHeight) diff --git a/cockatrice/src/game/zones/logic/view_zone_logic.cpp b/cockatrice/src/game/zones/logic/view_zone_logic.cpp index e61c126e7..5a4db3163 100644 --- a/cockatrice/src/game/zones/logic/view_zone_logic.cpp +++ b/cockatrice/src/game/zones/logic/view_zone_logic.cpp @@ -1,9 +1,8 @@ #include "view_zone_logic.h" +#include "../../../client/settings/cache_settings.h" #include "../../board/card_item.h" -#include - /** * @param _player the player that the cards are revealed to. * @param _origZone the zone the cards were revealed from. diff --git a/cockatrice/src/game/zones/select_zone.cpp b/cockatrice/src/game/zones/select_zone.cpp index ec24e4f9f..719eec148 100644 --- a/cockatrice/src/game/zones/select_zone.cpp +++ b/cockatrice/src/game/zones/select_zone.cpp @@ -1,11 +1,11 @@ #include "select_zone.h" +#include "../../client/settings/cache_settings.h" #include "../board/card_item.h" #include "../game_scene.h" #include #include -#include qreal divideCardSpaceInZone(qreal index, int cardCount, qreal totalHeight, qreal cardHeight, bool reverse) { diff --git a/cockatrice/src/game/zones/stack_zone.cpp b/cockatrice/src/game/zones/stack_zone.cpp index 4d8c15da8..0a67955bd 100644 --- a/cockatrice/src/game/zones/stack_zone.cpp +++ b/cockatrice/src/game/zones/stack_zone.cpp @@ -7,10 +7,10 @@ #include "../player/player.h" #include "logic/stack_zone_logic.h" +#include <../../client/settings/cache_settings.h> #include #include #include -#include StackZone::StackZone(StackZoneLogic *_logic, int _zoneHeight, QGraphicsItem *parent) : SelectZone(_logic, parent), zoneHeight(_zoneHeight) diff --git a/cockatrice/src/game/zones/table_zone.cpp b/cockatrice/src/game/zones/table_zone.cpp index b0484f984..b40903a00 100644 --- a/cockatrice/src/game/zones/table_zone.cpp +++ b/cockatrice/src/game/zones/table_zone.cpp @@ -7,13 +7,13 @@ #include "../player/player.h" #include "logic/table_zone_logic.h" +#include <../../client/settings/cache_settings.h> #include #include #include #include #include #include -#include const QColor TableZone::BACKGROUND_COLOR = QColor(100, 100, 100); const QColor TableZone::FADE_MASK = QColor(0, 0, 0, 80); diff --git a/cockatrice/src/game/zones/view_zone_widget.cpp b/cockatrice/src/game/zones/view_zone_widget.cpp index 2424feb9b..afb263615 100644 --- a/cockatrice/src/game/zones/view_zone_widget.cpp +++ b/cockatrice/src/game/zones/view_zone_widget.cpp @@ -7,6 +7,7 @@ #include "../player/player.h" #include "view_zone.h" +#include <../../client/settings/cache_settings.h> #include #include #include @@ -17,7 +18,6 @@ #include #include #include -#include /** * @param _player the player the cards were revealed to. 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 56b00e4b8..855e04028 100644 --- a/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp +++ b/cockatrice/src/interface/card_picture_loader/card_picture_loader.cpp @@ -1,5 +1,6 @@ #include "card_picture_loader.h" +#include <../../client/settings/cache_settings.h> #include #include #include @@ -15,7 +16,6 @@ #include #include #include -#include #include // never cache more than 300 cards at once for a single deck 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 a2058b0ed..6fc7d49c7 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 @@ -2,10 +2,10 @@ #include "card_picture_to_load.h" +#include <../../client/settings/cache_settings.h> #include #include #include -#include static constexpr int REFRESH_INTERVAL_MS = 10 * 1000; 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 f92848b22..bced8bea4 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 @@ -3,13 +3,13 @@ #include "card_picture_loader_local.h" #include "card_picture_loader_worker_work.h" +#include <../../client/settings/cache_settings.h> #include #include #include #include #include #include -#include #include static constexpr int MAX_REQUESTS_PER_SEC = 10; 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 eae93d46f..9b4638232 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 @@ -2,6 +2,7 @@ #include "card_picture_loader_worker.h" +#include <../../client/settings/cache_settings.h> #include #include #include @@ -11,7 +12,6 @@ #include #include #include -#include // Card back returned by gatherer when card is not found static const QStringList MD5_BLACKLIST = {"db0c48db407a907c16ade38de048a441"}; 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 4f1a27a98..cda3357cf 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,12 +1,12 @@ #include "card_picture_to_load.h" +#include <../../client/settings/cache_settings.h> #include #include #include #include #include #include -#include CardPictureToLoad::CardPictureToLoad(const ExactCard &_card) : card(_card), urlTemplates(SettingsCache::instance().downloads().getAllURLs()) diff --git a/cockatrice/src/interface/theme_manager.cpp b/cockatrice/src/interface/theme_manager.cpp index 4cb66e2b1..ec52a0f6e 100644 --- a/cockatrice/src/interface/theme_manager.cpp +++ b/cockatrice/src/interface/theme_manager.cpp @@ -1,12 +1,13 @@ #include "theme_manager.h" +#include "../../client/settings/cache_settings.h" + #include #include #include #include #include #include -#include #define NONE_THEME_NAME "Default" #define STYLE_CSS_NAME "style.css" diff --git a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp index c134b0aff..20f4b29df 100644 --- a/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/additional_info/color_identity_widget.cpp @@ -1,5 +1,6 @@ #include "color_identity_widget.h" +#include "../../../../client/settings/cache_settings.h" #include "mana_symbol_widget.h" #include @@ -8,7 +9,6 @@ #include #include #include -#include ColorIdentityWidget::ColorIdentityWidget(QWidget *parent, CardInfoPtr _card) : QWidget(parent), card(_card) { diff --git a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp index 942635871..07cc382ad 100644 --- a/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/additional_info/mana_symbol_widget.cpp @@ -1,7 +1,8 @@ #include "mana_symbol_widget.h" +#include "../../../../client/settings/cache_settings.h" + #include -#include ManaSymbolWidget::ManaSymbolWidget(QWidget *parent, QString _symbol, bool _isActive, bool _mayBeToggled) : QLabel(parent), symbol(_symbol), isActive(_isActive), mayBeToggled(_mayBeToggled) diff --git a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp index 6dad6424b..9fea41076 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_frame_widget.cpp @@ -1,5 +1,6 @@ #include "card_info_frame_widget.h" +#include "../../../client/settings/cache_settings.h" #include "../../../game/board/card_item.h" #include "card_info_display_widget.h" #include "card_info_picture_widget.h" @@ -9,7 +10,6 @@ #include #include #include -#include #include CardInfoFrameWidget::CardInfoFrameWidget(QWidget *parent) diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp index ead669e7c..9a79bd32f 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_enlarged_widget.cpp @@ -1,10 +1,10 @@ #include "card_info_picture_enlarged_widget.h" +#include "../../../client/settings/cache_settings.h" #include "../../../interface/card_picture_loader/card_picture_loader.h" #include #include -#include #include /** diff --git a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp index 8b744dc73..8ad86eadc 100644 --- a/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_info_picture_widget.cpp @@ -1,5 +1,6 @@ #include "card_info_picture_widget.h" +#include "../../../client/settings/cache_settings.h" #include "../../../game/board/card_item.h" #include "../../../interface/card_picture_loader/card_picture_loader.h" #include "../../../interface/widgets/tabs/tab_supervisor.h" @@ -12,7 +13,6 @@ #include #include #include -#include #include /** diff --git a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp index c084dac64..927d9bf5f 100644 --- a/cockatrice/src/interface/widgets/cards/card_size_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_size_widget.cpp @@ -1,10 +1,9 @@ #include "card_size_widget.h" +#include "../../../client/settings/cache_settings.h" #include "../printing_selector/printing_selector.h" #include "../visual_deck_storage/visual_deck_storage_widget.h" -#include - /** * @class CardSizeWidget * @brief A widget for adjusting card sizes using a slider. diff --git a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp index dfa7bc025..8f4e1a115 100644 --- a/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/deck_preview_card_picture_widget.cpp @@ -1,5 +1,7 @@ #include "deck_preview_card_picture_widget.h" +#include "../../../client/settings/cache_settings.h" + #include #include #include @@ -7,7 +9,6 @@ #include #include #include -#include /** * @brief Constructs a CardPictureWithTextOverlay widget. diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp index 947d522f1..b5aa007f0 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp @@ -1,5 +1,6 @@ #include "deck_editor_database_display_widget.h" +#include "../../../client/settings/cache_settings.h" #include "../../../filters/syntax_help.h" #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "../../../interface/widgets/tabs/tab_supervisor.h" @@ -14,7 +15,6 @@ #include #include #include -#include static bool canBeCommander(const CardInfo &cardInfo) { diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp index f5970c1e6..0e6b535bf 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp @@ -1,5 +1,7 @@ #include "deck_editor_deck_dock_widget.h" +#include "../../../client/settings/cache_settings.h" + #include #include #include @@ -7,7 +9,6 @@ #include #include #include -#include #include DeckEditorDeckDockWidget::DeckEditorDeckDockWidget(AbstractTabDeckEditor *parent) diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp index 69eb71c2b..4957e24ec 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp @@ -1,5 +1,6 @@ #include "deck_editor_filter_dock_widget.h" +#include "../../../client/settings/cache_settings.h" #include "../../../filters/filter_builder.h" #include "../../../filters/filter_tree_model.h" @@ -7,7 +8,6 @@ #include #include #include -#include DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent) : QDockWidget(parent), deckEditor(parent) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp index 3f398218e..ed32b356c 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_connect.cpp @@ -1,5 +1,7 @@ #include "dlg_connect.h" +#include "../../../client/settings/cache_settings.h" + #include #include #include @@ -12,7 +14,6 @@ #include #include #include -#include #include DlgConnect::DlgConnect(QWidget *parent) : QDialog(parent) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp index 86b002c92..d69c7a08a 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_create_game.cpp @@ -1,5 +1,6 @@ #include "dlg_create_game.h" +#include "../../../client/settings/cache_settings.h" #include "../interface/widgets/tabs/tab_room.h" #include @@ -17,7 +18,6 @@ #include #include #include -#include #include void DlgCreateGame::sharedCtor() diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp index 39b7333c5..5b120b1e2 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_default_tags_editor.cpp @@ -1,8 +1,9 @@ #include "dlg_default_tags_editor.h" +#include "../../../client/settings/cache_settings.h" + #include #include -#include DlgDefaultTagsEditor::DlgDefaultTagsEditor(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp index 105783210..998dafb66 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_password.cpp @@ -1,11 +1,12 @@ #include "dlg_edit_password.h" +#include "../../../client/settings/cache_settings.h" + #include #include #include #include #include -#include #include DlgEditPassword::DlgEditPassword(QWidget *parent) : QDialog(parent) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp index 70e99ca28..c39c87d4a 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_user.cpp @@ -1,11 +1,12 @@ #include "dlg_edit_user.h" +#include "../../../client/settings/cache_settings.h" + #include #include #include #include #include -#include #include DlgEditUser::DlgEditUser(QWidget *parent, QString email, QString country, QString realName) : QDialog(parent) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp index a8999d1e3..c8c86d1f1 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_challenge.cpp @@ -1,5 +1,7 @@ #include "dlg_forgot_password_challenge.h" +#include "../../../client/settings/cache_settings.h" + #include #include #include @@ -7,7 +9,6 @@ #include #include #include -#include #include DlgForgotPasswordChallenge::DlgForgotPasswordChallenge(QWidget *parent) : QDialog(parent) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp index 000e7b0f1..4921630f3 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_request.cpp @@ -1,5 +1,7 @@ #include "dlg_forgot_password_request.h" +#include "../../../client/settings/cache_settings.h" + #include #include #include @@ -7,7 +9,6 @@ #include #include #include -#include #include DlgForgotPasswordRequest::DlgForgotPasswordRequest(QWidget *parent) : QDialog(parent) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp index 43b6c2fb9..f08347879 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_forgot_password_reset.cpp @@ -1,5 +1,7 @@ #include "dlg_forgot_password_reset.h" +#include "../../../client/settings/cache_settings.h" + #include #include #include @@ -7,7 +9,6 @@ #include #include #include -#include #include DlgForgotPasswordReset::DlgForgotPasswordReset(QWidget *parent) : QDialog(parent) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp index 47718e158..798a06f73 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp @@ -1,7 +1,8 @@ #include "dlg_load_deck.h" #include -#include + +#include "../../../client/settings/cache_settings.h" DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck")) { diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp index e15e7518f..cfd99872a 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp @@ -1,5 +1,6 @@ #include "dlg_load_deck_from_clipboard.h" +#include "../../../client/settings/cache_settings.h" #include "dlg_settings.h" #include @@ -12,7 +13,6 @@ #include #include #include -#include /** * Creates the main layout and connects the signals that are common to all versions of this window diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp index 50233e03b..2d3bc08a4 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp @@ -1,5 +1,6 @@ #include "dlg_manage_sets.h" +#include "../../../client/settings/cache_settings.h" #include "../interface/card_picture_loader/card_picture_loader.h" #include "../interface/widgets/utility/custom_line_edit.h" #include "../main.h" @@ -21,7 +22,6 @@ #include #include #include -#include #define SORT_RESET -1 diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp index e71759554..dff99e4d8 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_register.cpp @@ -1,5 +1,7 @@ #include "dlg_register.h" +#include "../../../client/settings/cache_settings.h" + #include #include #include @@ -8,7 +10,6 @@ #include #include #include -#include #include DlgRegister::DlgRegister(QWidget *parent) : QDialog(parent) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp index 0c4b7797e..9db1ee2ef 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_settings.cpp @@ -1,5 +1,7 @@ #include "dlg_settings.h" +#include "../../../client/settings/cache_settings.h" +#include "../../../client/settings/shortcut_treeview.h" #include "../client/network/update/card_spoiler/spoiler_background_updater.h" #include "../client/network/update/client/release_channel.h" #include "../client/sound_engine.h" @@ -45,9 +47,7 @@ #include #include #include -#include #include -#include #define WIKI_CUSTOM_PIC_URL "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Picture-Download-URLs" #define WIKI_CUSTOM_SHORTCUTS "https://github.com/Cockatrice/Cockatrice/wiki/Custom-Keyboard-Shortcuts" diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp index c2a03a55e..ac1922a9d 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_startup_card_check.cpp @@ -1,7 +1,8 @@ #include "dlg_startup_card_check.h" +#include "../../../client/settings/cache_settings.h" + #include -#include DlgStartupCardCheck::DlgStartupCardCheck(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp index 6023ac48c..0197d3dbf 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_tip_of_the_day.cpp @@ -1,5 +1,6 @@ #include "dlg_tip_of_the_day.h" +#include "../../../client/settings/cache_settings.h" #include "tip_of_the_day.h" #include @@ -9,7 +10,6 @@ #include #include #include -#include #define MIN_TIP_IMAGE_HEIGHT 200 #define MIN_TIP_IMAGE_WIDTH 200 diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp index cd7f3e8ba..19182c55b 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_update.cpp @@ -1,5 +1,6 @@ #include "dlg_update.h" +#include "../../../client/settings/cache_settings.h" #include "../client/network/update/client/client_update_checker.h" #include "../client/network/update/client/release_channel.h" #include "../interface/window_main.h" @@ -13,7 +14,6 @@ #include #include #include -#include #include DlgUpdate::DlgUpdate(QWidget *parent) : QDialog(parent) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp index 0fb98bef9..f0542deaa 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp @@ -1,5 +1,7 @@ #include "dlg_view_log.h" +#include "../../../client/settings/cache_settings.h" + #include "../../logger.h" #include @@ -7,7 +9,6 @@ #include #include #include -#include DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/interface/widgets/general/home_widget.cpp b/cockatrice/src/interface/widgets/general/home_widget.cpp index f36f1831a..17283f035 100644 --- a/cockatrice/src/interface/widgets/general/home_widget.cpp +++ b/cockatrice/src/interface/widgets/general/home_widget.cpp @@ -1,5 +1,6 @@ #include "home_widget.h" +#include "../../../client/settings/cache_settings.h" #include "../../../interface/widgets/tabs/tab_supervisor.h" #include "../../window_main.h" #include "background_sources.h" @@ -11,7 +12,6 @@ #include #include #include -#include HomeWidget::HomeWidget(QWidget *parent, TabSupervisor *_tabSupervisor) : QWidget(parent), tabSupervisor(_tabSupervisor), background("theme:backgrounds/home"), overlay("theme:cockatrice") diff --git a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp index aac488dd1..d2abf9c9d 100644 --- a/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp +++ b/cockatrice/src/interface/widgets/menus/deck_editor_menu.cpp @@ -1,6 +1,7 @@ #include "../../../interface/widgets/menus/deck_editor_menu.h" -#include +#include "../../../client/settings/cache_settings.h" + #include DeckEditorMenu::DeckEditorMenu(AbstractTabDeckEditor *parent) : QMenu(parent), deckEditor(parent) diff --git a/cockatrice/src/interface/widgets/menus/tearoff_menu.h b/cockatrice/src/interface/widgets/menus/tearoff_menu.h index d2b3f3413..3e6c47012 100644 --- a/cockatrice/src/interface/widgets/menus/tearoff_menu.h +++ b/cockatrice/src/interface/widgets/menus/tearoff_menu.h @@ -6,8 +6,9 @@ #pragma once +#include "../../../client/settings/cache_settings.h" + #include -#include class TearOffMenu : public QMenu { diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp index 8afd56f9a..1a47c56a6 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.cpp @@ -1,5 +1,6 @@ #include "printing_selector.h" +#include "../../../client/settings/cache_settings.h" #include "../../../interface/card_picture_loader/card_picture_loader.h" #include "../../../interface/widgets/dialogs/dlg_select_set_for_cards.h" #include "printing_selector_card_display_widget.h" @@ -9,7 +10,6 @@ #include #include -#include #include /** diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp index 56e5d1aab..40f38ac43 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.cpp @@ -1,5 +1,6 @@ #include "printing_selector_card_overlay_widget.h" +#include "../../../client/settings/cache_settings.h" #include "printing_selector_card_display_widget.h" #include @@ -7,7 +8,6 @@ #include #include #include -#include #include /** diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp index d95019e80..b1477e346 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_sorting_widget.cpp @@ -1,7 +1,8 @@ #include "printing_selector_card_sorting_widget.h" +#include "../../../client/settings/cache_settings.h" + #include -#include const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_ALPHABETICAL = tr("Alphabetical"); const QString PrintingSelectorCardSortingWidget::SORT_OPTIONS_PREFERENCE = tr("Preference"); diff --git a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp index 2b9ab72e9..fb5936cae 100644 --- a/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp +++ b/cockatrice/src/interface/widgets/replay/replay_timeline_widget.cpp @@ -1,10 +1,11 @@ #include "replay_timeline_widget.h" +#include "../../../client/settings/cache_settings.h" + #include #include #include #include -#include ReplayTimelineWidget::ReplayTimelineWidget(QWidget *parent) : QWidget(parent), maxBinValue(1), maxTime(1), timeScaleFactor(1.0), currentVisualTime(0), currentProcessedTime(0), diff --git a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp index 10897b651..c97d32d44 100644 --- a/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp +++ b/cockatrice/src/interface/widgets/server/chat_view/chat_view.cpp @@ -1,5 +1,6 @@ #include "chat_view.h" +#include "../../../../client/settings/cache_settings.h" #include "../../client/sound_engine.h" #include "../../interface/pixel_map_generator.h" #include "../../interface/widgets/tabs/tab_account.h" @@ -13,7 +14,6 @@ #include #include #include -#include const QColor DEFAULT_MENTION_COLOR = QColor(194, 31, 47); diff --git a/cockatrice/src/interface/widgets/server/games_model.cpp b/cockatrice/src/interface/widgets/server/games_model.cpp index 8c9e2c723..1da92cdad 100644 --- a/cockatrice/src/interface/widgets/server/games_model.cpp +++ b/cockatrice/src/interface/widgets/server/games_model.cpp @@ -1,5 +1,6 @@ #include "games_model.h" +#include "../../../client/settings/cache_settings.h" #include "../interface/pixel_map_generator.h" #include "../interface/widgets/tabs/tab_account.h" #include "user/user_list_manager.h" @@ -12,7 +13,6 @@ #include #include #include -#include enum GameListColumn { diff --git a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp index 2497ecdcc..6a8754a79 100644 --- a/cockatrice/src/interface/widgets/server/handle_public_servers.cpp +++ b/cockatrice/src/interface/widgets/server/handle_public_servers.cpp @@ -1,11 +1,12 @@ #include "handle_public_servers.h" +#include "../../../client/settings/cache_settings.h" + #include #include #include #include #include -#include #define PUBLIC_SERVERS_JSON "https://cockatrice.github.io/public-servers.json" diff --git a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp index 813a9236c..069e438a9 100644 --- a/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp +++ b/cockatrice/src/interface/widgets/server/user/user_info_connection.cpp @@ -1,7 +1,8 @@ #include "user_info_connection.h" +#include "../../../../client/settings/cache_settings.h" + #include -#include #include UserConnection_Information::UserConnection_Information() = default; diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp index 631803092..4236c3858 100644 --- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp @@ -1,5 +1,6 @@ #include "abstract_tab_deck_editor.h" +#include "../../../client/settings/cache_settings.h" #include "../client/network/interfaces/deck_stats_interface.h" #include "../client/network/interfaces/tapped_out_interface.h" #include "../interface/card_picture_loader/card_picture_loader.h" @@ -37,7 +38,6 @@ #include #include #include -#include #include AbstractTabDeckEditor::AbstractTabDeckEditor(TabSupervisor *_tabSupervisor) : Tab(_tabSupervisor) diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp index 034800158..4bb4ffcda 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp @@ -1,5 +1,6 @@ #include "tab_deck_editor.h" +#include "../../../client/settings/cache_settings.h" #include "../client/network/interfaces/tapped_out_interface.h" #include "../filters/filter_builder.h" #include "../filters/filter_tree_model.h" @@ -36,7 +37,6 @@ #include #include #include -#include #include TabDeckEditor::TabDeckEditor(TabSupervisor *_tabSupervisor) : AbstractTabDeckEditor(_tabSupervisor) diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp index 7ca0bad1f..cf8acec5a 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp @@ -1,5 +1,6 @@ #include "tab_deck_storage.h" +#include "../../../client/settings/cache_settings.h" #include "../interface/widgets/server/remote/remote_decklist_tree_widget.h" #include "../interface/widgets/utility/get_text_with_max.h" @@ -28,7 +29,6 @@ #include #include #include -#include TabDeckStorage::TabDeckStorage(TabSupervisor *_tabSupervisor, AbstractClient *_client, diff --git a/cockatrice/src/interface/widgets/tabs/tab_game.cpp b/cockatrice/src/interface/widgets/tabs/tab_game.cpp index f55450de9..9206c61a8 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_game.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_game.cpp @@ -1,5 +1,6 @@ #include "tab_game.h" +#include "../../../client/settings/cache_settings.h" #include "../game/board/arrow_item.h" #include "../game/board/card_item.h" #include "../game/deckview/deck_view_container.h" @@ -44,7 +45,6 @@ #include #include #include -#include #include TabGame::TabGame(TabSupervisor *_tabSupervisor, GameReplay *_replay) diff --git a/cockatrice/src/interface/widgets/tabs/tab_message.cpp b/cockatrice/src/interface/widgets/tabs/tab_message.cpp index 3e6a86384..f1a942f16 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_message.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_message.cpp @@ -1,5 +1,6 @@ #include "tab_message.h" +#include "../../../client/settings/cache_settings.h" #include "../client/sound_engine.h" #include "../interface/widgets/server/chat_view/chat_view.h" #include "../interface/widgets/server/user/user_list_manager.h" @@ -16,7 +17,6 @@ #include #include #include -#include #include TabMessage::TabMessage(TabSupervisor *_tabSupervisor, diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp index e90926768..8d7081407 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp @@ -1,5 +1,6 @@ #include "tab_replays.h" +#include "../../../client/settings/cache_settings.h" #include "../interface/widgets/server/remote/remote_replay_list_tree_widget.h" #include "tab_game.h" @@ -29,7 +30,6 @@ #include #include #include -#include TabReplays::TabReplays(TabSupervisor *_tabSupervisor, AbstractClient *_client, const ServerInfo_User *currentUserInfo) : Tab(_tabSupervisor), client(_client) diff --git a/cockatrice/src/interface/widgets/tabs/tab_room.cpp b/cockatrice/src/interface/widgets/tabs/tab_room.cpp index 808c888cd..e1fcca216 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_room.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_room.cpp @@ -1,5 +1,6 @@ #include "tab_room.h" +#include "../../../client/settings/cache_settings.h" #include "../interface/widgets/dialogs/dlg_settings.h" #include "../interface/widgets/server/chat_view/chat_view.h" #include "../interface/widgets/server/game_selector.h" @@ -30,7 +31,6 @@ #include #include #include -#include #include TabRoom::TabRoom(TabSupervisor *_tabSupervisor, diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp index 8eee1d5e0..db6bc1151 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp @@ -1,5 +1,6 @@ #include "tab_supervisor.h" +#include "../../../client/settings/cache_settings.h" #include "../interface/pixel_map_generator.h" #include "../interface/widgets/server/user/user_list_manager.h" #include "../interface/widgets/server/user/user_list_widget.h" @@ -35,7 +36,6 @@ #include #include #include -#include QRect MacOSTabFixStyle::subElementRect(SubElement element, const QStyleOption *option, const QWidget *widget) const { diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp index 725a4e106..90b08f1af 100644 --- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp +++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp @@ -1,5 +1,6 @@ #include "tab_deck_editor_visual.h" +#include "../../../../client/settings/cache_settings.h" #include "../../client/network/interfaces/deck_stats_interface.h" #include "../../filters/filter_builder.h" #include "../../interface/pixel_map_generator.h" @@ -31,7 +32,6 @@ #include #include #include -#include #include TabDeckEditorVisual::TabDeckEditorVisual(TabSupervisor *_tabSupervisor) : AbstractTabDeckEditor(_tabSupervisor) diff --git a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp index 532afc114..802a52538 100644 --- a/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp +++ b/cockatrice/src/interface/widgets/utility/custom_line_edit.cpp @@ -1,11 +1,12 @@ #include "custom_line_edit.h" +#include "../../../client/settings/cache_settings.h" + #include #include #include #include #include -#include #include LineEditUnfocusable::LineEditUnfocusable(QWidget *parent) : QLineEdit(parent) diff --git a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp index 53776a3b0..7e14d4335 100644 --- a/cockatrice/src/interface/widgets/utility/sequence_edit.cpp +++ b/cockatrice/src/interface/widgets/utility/sequence_edit.cpp @@ -1,9 +1,10 @@ #include "sequence_edit.h" +#include "../../../client/settings/cache_settings.h" + #include #include #include -#include #include SequenceEdit::SequenceEdit(const QString &_shortcutName, QWidget *parent) : QWidget(parent) diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp index e8c42a28a..6a85dfcb1 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_filter_save_load_widget.cpp @@ -1,5 +1,6 @@ #include "visual_database_display_filter_save_load_widget.h" +#include "../../../client/settings/cache_settings.h" #include "../../../filters/filter_tree.h" #include "visual_database_filter_display_widget.h" @@ -7,7 +8,6 @@ #include #include #include -#include VisualDatabaseDisplayFilterSaveLoadWidget::VisualDatabaseDisplayFilterSaveLoadWidget(QWidget *parent, FilterTreeModel *_filterModel) diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp index 5a9c1029c..06844121e 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_set_filter_widget.cpp @@ -1,5 +1,6 @@ #include "visual_database_display_set_filter_widget.h" +#include "../../../client/settings/cache_settings.h" #include "../../../filters/filter_tree.h" #include "../../../filters/filter_tree_model.h" @@ -8,7 +9,6 @@ #include #include #include -#include VisualDatabaseDisplayRecentSetFilterSettingsWidget::VisualDatabaseDisplayRecentSetFilterSettingsWidget(QWidget *parent) : QWidget(parent) diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp index 673a2ec1a..d371d0ed3 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp @@ -1,5 +1,6 @@ #include "visual_database_display_widget.h" +#include "../../../client/settings/cache_settings.h" #include "../../../filters/filter_tree_model.h" #include "../../../filters/syntax_help.h" #include "../../pixel_map_generator.h" @@ -18,7 +19,6 @@ #include #include #include -#include #include #include diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp index 093a52d72..5364fa813 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_filter_display_widget.cpp @@ -1,12 +1,13 @@ #include "visual_database_filter_display_widget.h" +#include "../../../client/settings/cache_settings.h" + #include #include #include #include #include #include -#include FilterDisplayWidget::FilterDisplayWidget(QWidget *parent, const QString &filename, FilterTreeModel *_filterModel) : QWidget(parent), filterFilename(filename), filterModel(_filterModel) diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp index a2bd051ff..7e4e2407d 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp @@ -1,10 +1,10 @@ #include "visual_deck_editor_sample_hand_widget.h" +#include "../../../client/settings/cache_settings.h" #include "../cards/card_info_picture_widget.h" #include #include -#include #include VisualDeckEditorSampleHandWidget::VisualDeckEditorSampleHandWidget(QWidget *parent, DeckListModel *_deckListModel) diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp index 4053de89b..fbff6c434 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp @@ -1,5 +1,6 @@ #include "deck_preview_deck_tags_display_widget.h" +#include "../../../../client/settings/cache_settings.h" #include "../../../../interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h" #include "../../../../interface/widgets/tabs/tab_deck_editor.h" #include "../../general/layout_containers/flow_widget.h" @@ -12,7 +13,6 @@ #include #include #include -#include DeckPreviewDeckTagsDisplayWidget::DeckPreviewDeckTagsDisplayWidget(QWidget *_parent, DeckList *_deckList) : QWidget(_parent), deckList(nullptr) diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp index a8979bae9..a221442ba 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_addition_widget.cpp @@ -1,5 +1,6 @@ #include "deck_preview_tag_addition_widget.h" +#include "../../../../client/settings/cache_settings.h" #include "../../../../interface/widgets/tabs/abstract_tab_deck_editor.h" #include "deck_preview_tag_dialog.h" @@ -7,7 +8,6 @@ #include #include #include -#include #include DeckPreviewTagAdditionWidget::DeckPreviewTagAdditionWidget(QWidget *_parent, QString _tagName) diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp index 9d130946f..df7f9738d 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_tag_dialog.cpp @@ -1,5 +1,6 @@ #include "deck_preview_tag_dialog.h" +#include "../../../../client/settings/cache_settings.h" #include "../../../../interface/widgets/dialogs/dlg_default_tags_editor.h" #include "deck_preview_tag_item_widget.h" @@ -11,7 +12,6 @@ #include #include #include -#include DeckPreviewTagDialog::DeckPreviewTagDialog(const QStringList &knownTags, const QStringList &_activeTags, diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index afa6b6d72..21e85bdbd 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -1,5 +1,6 @@ #include "deck_preview_widget.h" +#include "../../../../client/settings/cache_settings.h" #include "../../cards/additional_info/color_identity_widget.h" #include "../../cards/deck_preview_card_picture_widget.h" #include "deck_preview_deck_tags_display_widget.h" @@ -14,7 +15,6 @@ #include #include #include -#include DeckPreviewWidget::DeckPreviewWidget(QWidget *_parent, VisualDeckStorageWidget *_visualDeckStorageWidget, diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp index f36b84a1c..c628a15aa 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_folder_display_widget.cpp @@ -1,10 +1,10 @@ #include "visual_deck_storage_folder_display_widget.h" +#include "../../../client/settings/cache_settings.h" #include "deck_preview/deck_preview_widget.h" #include #include -#include VisualDeckStorageFolderDisplayWidget::VisualDeckStorageFolderDisplayWidget( QWidget *parent, diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp index 19bf070c9..c1e9bfa6a 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_quick_settings_widget.cpp @@ -1,11 +1,11 @@ #include "visual_deck_storage_quick_settings_widget.h" +#include "../../../client/settings/cache_settings.h" #include "visual_deck_storage_widget.h" #include #include #include -#include VisualDeckStorageQuickSettingsWidget::VisualDeckStorageQuickSettingsWidget(QWidget *parent) : SettingsButtonWidget(parent) diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp index 18430d698..dbd7929c5 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_search_widget.cpp @@ -1,11 +1,11 @@ #include "visual_deck_storage_search_widget.h" +#include "../../../client/settings/cache_settings.h" #include "../../../filters/deck_filter_string.h" #include "../../../filters/syntax_help.h" #include "../../pixel_map_generator.h" #include -#include /** * @brief Constructs a PrintingSelectorCardSearchWidget for searching cards by set name or set code. diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp index c68dfdc3b..901a4cb9f 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_widget.cpp @@ -1,6 +1,6 @@ #include "visual_deck_storage_sort_widget.h" -#include +#include "../../../client/settings/cache_settings.h" /** * @brief Constructs a PrintingSelectorCardSortWidget for searching cards by set name or set code. diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp index 164aff8bc..d9cf74e7f 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.cpp @@ -1,5 +1,6 @@ #include "visual_deck_storage_widget.h" +#include "../../../client/settings/cache_settings.h" #include "../quick_settings/settings_button_widget.h" #include "deck_preview/deck_preview_widget.h" #include "visual_deck_storage_folder_display_widget.h" @@ -13,7 +14,6 @@ #include #include #include -#include VisualDeckStorageWidget::VisualDeckStorageWidget(QWidget *parent) : QWidget(parent), folderWidget(nullptr) { diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp index 4186f7ce7..fabcfe032 100644 --- a/cockatrice/src/interface/window_main.cpp +++ b/cockatrice/src/interface/window_main.cpp @@ -40,6 +40,7 @@ #include "version_string.h" #include "widgets/utility/get_text_with_max.h" +#include <../client/settings/cache_settings.h> #include #include #include @@ -71,7 +72,6 @@ #include #include #include -#include #define GITHUB_PAGES_URL "https://cockatrice.github.io" #define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors?type=c" diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index ecb915cee..8be785e43 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -22,6 +22,7 @@ #include "QtNetwork/QNetworkInterface" #include "client/network/update/card_spoiler/spoiler_background_updater.h" +#include "client/settings/cache_settings.h" #include "client/sound_engine.h" #include "interface/logger.h" #include "interface/pixel_map_generator.h" @@ -42,9 +43,9 @@ #include #include #include +#include #include #include -#include QTranslator *translator, *qtTranslator; RNG_Abstract *rng; @@ -266,6 +267,8 @@ int main(int argc, char *argv[]) SettingsCache::instance().setClientID(generateClientID()); + CardDatabaseManager::setCardPreferenceProvider(QSharedPointer::create()); + // If spoiler mode is enabled, we will download the spoilers // then reload the DB. otherwise just reload the DB SpoilerBackgroundUpdater spoilerBackgroundUpdater; diff --git a/dbconverter/src/mocks.h b/dbconverter/src/mocks.h index 497f76e72..1e49ab32e 100644 --- a/dbconverter/src/mocks.h +++ b/dbconverter/src/mocks.h @@ -10,8 +10,8 @@ #define PICTURELOADER_H +#include <../../cockatrice/src/client/settings/cache_settings.h> #include -#include #include extern SettingsCache *settingsCache; diff --git a/libcockatrice_card/CMakeLists.txt b/libcockatrice_card/CMakeLists.txt index 7217f7bff..f2ad290cd 100644 --- a/libcockatrice_card/CMakeLists.txt +++ b/libcockatrice_card/CMakeLists.txt @@ -9,6 +9,8 @@ set(HEADERS libcockatrice/card/database/card_database_loader.h libcockatrice/card/database/card_database_manager.h libcockatrice/card/database/card_database_querier.h + libcockatrice/card/database/interface/interface_card_preference_provider.h + libcockatrice/card/database/interface/noop_card_preference_provider.h libcockatrice/card/database/parser/card_database_parser.h libcockatrice/card/database/parser/cockatrice_xml_3.h libcockatrice/card/database/parser/cockatrice_xml_4.h diff --git a/libcockatrice_card/libcockatrice/card/card_info.cpp b/libcockatrice_card/libcockatrice/card/card_info.cpp index 4646b3890..93c17000b 100644 --- a/libcockatrice_card/libcockatrice/card/card_info.cpp +++ b/libcockatrice_card/libcockatrice/card/card_info.cpp @@ -5,13 +5,13 @@ #include "relation/card_relation.h" #include "set/card_set.h" +#include <../../../cockatrice/src/client/settings/cache_settings.h> #include #include #include #include #include #include -#include #include class CardRelation; diff --git a/libcockatrice_card/libcockatrice/card/database/card_database.cpp b/libcockatrice_card/libcockatrice/card/database/card_database.cpp index bd43c68fe..c6a89664e 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database.cpp +++ b/libcockatrice_card/libcockatrice/card/database/card_database.cpp @@ -4,6 +4,7 @@ #include "parser/cockatrice_xml_3.h" #include "parser/cockatrice_xml_4.h" +#include <../../../../cockatrice/src/client/settings/cache_settings.h> #include #include #include @@ -12,7 +13,6 @@ #include #include #include -#include #include CardDatabase::CardDatabase(QObject *parent, QSharedPointer prefs) diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp index b1300e2a2..4aae0bce8 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp +++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp @@ -4,11 +4,11 @@ #include "parser/cockatrice_xml_3.h" #include "parser/cockatrice_xml_4.h" +#include <../../../../cockatrice/src/client/settings/cache_settings.h> #include #include #include #include -#include CardDatabaseLoader::CardDatabaseLoader(QObject *parent, CardDatabase *db) : QObject(parent), database(db) { diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp index 782da0133..9fb789718 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp +++ b/libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp @@ -1,9 +1,16 @@ #include "card_database_manager.h" +QSharedPointer CardDatabaseManager::cardPreferenceProvider = + QSharedPointer::create(); + +void CardDatabaseManager::setCardPreferenceProvider(QSharedPointer provider) +{ + cardPreferenceProvider = provider; +} + CardDatabase *CardDatabaseManager::getInstance() { - static CardDatabase instance( - nullptr, QSharedPointer::create()); // Created only once, on first access + static CardDatabase instance(nullptr, cardPreferenceProvider); return &instance; } diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_manager.h b/libcockatrice_card/libcockatrice/card/database/card_database_manager.h index 1962460fc..ba67afa6d 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database_manager.h +++ b/libcockatrice_card/libcockatrice/card/database/card_database_manager.h @@ -17,6 +17,9 @@ public: CardDatabaseManager(const CardDatabaseManager &) = delete; CardDatabaseManager &operator=(const CardDatabaseManager &) = delete; + // To be called once, before instantiation of the manager + static void setCardPreferenceProvider(QSharedPointer provider); + // Static method to access the singleton instance static CardDatabase *getInstance(); static CardDatabaseQuerier *query(); @@ -24,6 +27,7 @@ public: private: CardDatabaseManager() = default; // Private constructor ~CardDatabaseManager() = default; + static QSharedPointer cardPreferenceProvider; }; #endif // CARD_DATABASE_ACCESSOR_H diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp index 13bfb6b54..c32e8a5b1 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp +++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp @@ -1,10 +1,10 @@ #include "card_database_querier.h" +#include "../../../../cockatrice/src/database/interface/settings_card_preference_provider.h" #include "../card_info.h" #include "../printing/exact_card.h" #include "../set/card_set_comparator.h" #include "card_database.h" -#include "interface/settings_card_preference_provider.h" #include diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_querier.h b/libcockatrice_card/libcockatrice/card/database/card_database_querier.h index 5d4ce7d37..93331756c 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database_querier.h +++ b/libcockatrice_card/libcockatrice/card/database/card_database_querier.h @@ -7,10 +7,10 @@ #ifndef COCKATRICE_CARD_DATABASE_QUERIER_H #define COCKATRICE_CARD_DATABASE_QUERIER_H +#include "../../../../cockatrice/src/database/interface/settings_card_preference_provider.h" #include "../card_info.h" #include "../printing/exact_card.h" #include "interface/interface_card_preference_provider.h" -#include "interface/settings_card_preference_provider.h" #include #include diff --git a/cockatrice/src/database/interface/interface_card_preference_provider.h b/libcockatrice_card/libcockatrice/card/database/interface/interface_card_preference_provider.h similarity index 100% rename from cockatrice/src/database/interface/interface_card_preference_provider.h rename to libcockatrice_card/libcockatrice/card/database/interface/interface_card_preference_provider.h diff --git a/cockatrice/src/database/interface/noop_card_preference_provider.h b/libcockatrice_card/libcockatrice/card/database/interface/noop_card_preference_provider.h similarity index 100% rename from cockatrice/src/database/interface/noop_card_preference_provider.h rename to libcockatrice_card/libcockatrice/card/database/interface/noop_card_preference_provider.h diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp index 9c80014bf..ded645a4c 100644 --- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp +++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp @@ -6,7 +6,6 @@ #include #include #include -#include #include #define COCKATRICE_XML4_TAGNAME "cockatrice_carddatabase" @@ -132,7 +131,8 @@ QVariantHash CockatriceXml4Parser::loadCardPropertiesFromXml(QXmlStreamReader &x void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml) { - bool includeRebalancedCards = SettingsCache::instance().getIncludeRebalancedCards(); + bool includeRebalancedCards = + true; // TODO: MOVE THIS OUT OF THE PARSER SettingsCache::instance().getIncludeRebalancedCards(); while (!xml.atEnd()) { if (xml.readNext() == QXmlStreamReader::EndElement) { break; diff --git a/libcockatrice_card/libcockatrice/card/set/card_set.cpp b/libcockatrice_card/libcockatrice/card/set/card_set.cpp index 6b4a8f764..8fc362a97 100644 --- a/libcockatrice_card/libcockatrice/card/set/card_set.cpp +++ b/libcockatrice_card/libcockatrice/card/set/card_set.cpp @@ -1,6 +1,6 @@ #include "card_set.h" -#include +#include <../../../../cockatrice/src/client/settings/cache_settings.h> const char *CardSet::TOKENS_SETNAME = "TK"; diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp index 01ae68a71..c34d2115e 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp @@ -11,7 +11,6 @@ #include #include #include -#include DeckListModel::DeckListModel(QObject *parent) : QAbstractItemModel(parent), lastKnownColumn(1), lastKnownOrder(Qt::AscendingOrder) diff --git a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp index fdcbfae88..1296d442d 100644 --- a/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp +++ b/libcockatrice_network/libcockatrice/network/client/remote/remote_client.cpp @@ -3,6 +3,7 @@ #include "../../../../cockatrice/src/main.h" #include "version_string.h" +#include <../../../../../cockatrice/src/client/settings/cache_settings.h> #include #include #include @@ -21,7 +22,6 @@ #include #include #include -#include #include static const unsigned int protocolVersion = 14; diff --git a/libcockatrice_settings/CMakeLists.txt b/libcockatrice_settings/CMakeLists.txt index bacb397bf..72596b4b0 100644 --- a/libcockatrice_settings/CMakeLists.txt +++ b/libcockatrice_settings/CMakeLists.txt @@ -3,7 +3,6 @@ set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) set(HEADERS - libcockatrice/settings/cache_settings.h libcockatrice/settings/card_counter_settings.h libcockatrice/settings/card_database_settings.h libcockatrice/settings/card_override_settings.h @@ -15,7 +14,6 @@ set(HEADERS libcockatrice/settings/recents_settings.h libcockatrice/settings/servers_settings.h libcockatrice/settings/settings_manager.h - libcockatrice/settings/shortcut_treeview.h libcockatrice/settings/shortcuts_settings.h ) @@ -28,7 +26,6 @@ endif() add_library( libcockatrice_settings STATIC ${MOC_SOURCES} - libcockatrice/settings/cache_settings.cpp libcockatrice/settings/card_counter_settings.cpp libcockatrice/settings/card_database_settings.cpp libcockatrice/settings/card_override_settings.cpp @@ -40,7 +37,6 @@ add_library( libcockatrice/settings/recents_settings.cpp libcockatrice/settings/servers_settings.cpp libcockatrice/settings/settings_manager.cpp - libcockatrice/settings/shortcut_treeview.cpp libcockatrice/settings/shortcuts_settings.cpp ) diff --git a/oracle/src/main.cpp b/oracle/src/main.cpp index 3215f1d44..5def0c887 100644 --- a/oracle/src/main.cpp +++ b/oracle/src/main.cpp @@ -3,13 +3,13 @@ #include "interface/theme_manager.h" #include "oraclewizard.h" +#include <../../cockatrice/src/client/settings/cache_settings.h> #include #include #include #include #include #include -#include QTranslator *translator, *qtTranslator; ThemeManager *themeManager; diff --git a/oracle/src/oraclewizard.cpp b/oracle/src/oraclewizard.cpp index eeadfb8be..0e4132f92 100644 --- a/oracle/src/oraclewizard.cpp +++ b/oracle/src/oraclewizard.cpp @@ -1,5 +1,6 @@ #include "oraclewizard.h" +#include "../../../client/settings/cache_settings.h" #include "main.h" #include "oracleimporter.h" #include "version_string.h" @@ -24,7 +25,6 @@ #include #include #include -#include #ifdef HAS_LZMA #include "lzma/decompress.h" diff --git a/tests/carddatabase/mocks.h b/tests/carddatabase/mocks.h index 497f76e72..1e49ab32e 100644 --- a/tests/carddatabase/mocks.h +++ b/tests/carddatabase/mocks.h @@ -10,8 +10,8 @@ #define PICTURELOADER_H +#include <../../cockatrice/src/client/settings/cache_settings.h> #include -#include #include extern SettingsCache *settingsCache;