From 7f157496d3cb0d1bb5c8466fce1edcd67021ffbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Thu, 4 Sep 2025 22:08:22 +0200 Subject: [PATCH] Move deck list to its own folder ahead of refactor. Took 39 minutes --- cockatrice/src/client/tabs/tab_deck_storage.cpp | 2 +- cockatrice/src/client/tapped_out_interface.cpp | 2 +- cockatrice/src/client/tapped_out_interface.h | 2 +- .../client/ui/widgets/deck_analytics/deck_analytics_widget.h | 2 +- .../src/client/ui/widgets/deck_analytics/mana_base_widget.cpp | 2 +- .../src/client/ui/widgets/deck_analytics/mana_base_widget.h | 2 +- .../src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp | 2 +- .../client/ui/widgets/deck_analytics/mana_devotion_widget.cpp | 2 +- .../src/client/ui/widgets/deck_analytics/mana_devotion_widget.h | 2 +- cockatrice/src/deck/deck_list_model.h | 2 +- cockatrice/src/deck/deck_loader.cpp | 2 +- cockatrice/src/deck/deck_loader.h | 2 +- cockatrice/src/deck/deck_stats_interface.cpp | 2 +- cockatrice/src/deck/deck_stats_interface.h | 2 +- cockatrice/src/dialogs/dlg_create_token.cpp | 2 +- cockatrice/src/game/deckview/deck_view.cpp | 2 +- common/CMakeLists.txt | 2 +- common/{decklist.cpp => deck_list/deck_list.cpp} | 2 +- common/{decklist.h => deck_list/deck_list.h} | 2 +- common/server_game.cpp | 2 +- common/server_player.cpp | 2 +- servatrice/src/servatrice.cpp | 2 +- servatrice/src/servatrice_database_interface.cpp | 2 +- servatrice/src/serversocketinterface.cpp | 2 +- tests/loading_from_clipboard/CMakeLists.txt | 2 +- tests/loading_from_clipboard/clipboard_testing.h | 2 +- 26 files changed, 26 insertions(+), 26 deletions(-) rename common/{decklist.cpp => deck_list/deck_list.cpp} (99%) rename common/{decklist.h => deck_list/deck_list.h} (99%) diff --git a/cockatrice/src/client/tabs/tab_deck_storage.cpp b/cockatrice/src/client/tabs/tab_deck_storage.cpp index 426431c68..9b663f6c7 100644 --- a/cockatrice/src/client/tabs/tab_deck_storage.cpp +++ b/cockatrice/src/client/tabs/tab_deck_storage.cpp @@ -1,11 +1,11 @@ #include "tab_deck_storage.h" +#include "../../../../common/deck_list/deck_list.h" #include "../../deck/deck_loader.h" #include "../../server/pending_command.h" #include "../../server/remote/remote_decklist_tree_widget.h" #include "../../settings/cache_settings.h" #include "../get_text_with_max.h" -#include "decklist.h" #include "pb/command_deck_del.pb.h" #include "pb/command_deck_del_dir.pb.h" #include "pb/command_deck_download.pb.h" diff --git a/cockatrice/src/client/tapped_out_interface.cpp b/cockatrice/src/client/tapped_out_interface.cpp index 9b9a239d4..2ccc2276a 100644 --- a/cockatrice/src/client/tapped_out_interface.cpp +++ b/cockatrice/src/client/tapped_out_interface.cpp @@ -1,6 +1,6 @@ #include "tapped_out_interface.h" -#include "decklist.h" +#include "../../../common/deck_list/deck_list.h" #include #include diff --git a/cockatrice/src/client/tapped_out_interface.h b/cockatrice/src/client/tapped_out_interface.h index a6a763d45..9153e78fd 100644 --- a/cockatrice/src/client/tapped_out_interface.h +++ b/cockatrice/src/client/tapped_out_interface.h @@ -1,8 +1,8 @@ #ifndef TAPPEDOUT_INTERFACE_H #define TAPPEDOUT_INTERFACE_H +#include "../../../common/deck_list/deck_list.h" #include "../game/cards/card_database.h" -#include "decklist.h" #include #include diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/deck_analytics_widget.h b/cockatrice/src/client/ui/widgets/deck_analytics/deck_analytics_widget.h index b379b435c..16037da8a 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/deck_analytics_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_analytics/deck_analytics_widget.h @@ -7,11 +7,11 @@ #include "mana_curve_widget.h" #include "mana_devotion_widget.h" +#include <../../../../../common/deck_list/deck_list.h> #include #include #include #include -#include class DeckAnalyticsWidget : public QWidget { diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp index 98e56df66..88299d641 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.cpp @@ -6,9 +6,9 @@ #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" +#include <../../../../../common/deck_list/deck_list.h> #include #include -#include ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel) : QWidget(parent), deckListModel(_deckListModel) diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.h b/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.h index 66442f687..9deff68cf 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_base_widget.h @@ -4,9 +4,9 @@ #include "../../../../deck/deck_list_model.h" #include "../general/display/banner_widget.h" +#include <../../../../../common/deck_list/deck_list.h> #include #include -#include #include class ManaBaseWidget : public QWidget diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp b/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp index 0831ad655..f5f070896 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_curve_widget.cpp @@ -7,7 +7,7 @@ #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" -#include +#include <../../../../../common/deck_list/deck_list.h> #include ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel) diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp b/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp index 485afc475..e067cec97 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.cpp @@ -7,7 +7,7 @@ #include "../general/display/banner_widget.h" #include "../general/display/bar_widget.h" -#include +#include <../../../../../common/deck_list/deck_list.h> #include #include #include diff --git a/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.h b/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.h index 551ecd82d..9ff36451a 100644 --- a/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.h +++ b/cockatrice/src/client/ui/widgets/deck_analytics/mana_devotion_widget.h @@ -4,9 +4,9 @@ #include "../../../../deck/deck_list_model.h" #include "../general/display/banner_widget.h" +#include <../../../../../common/deck_list/deck_list.h> #include #include -#include #include class ManaDevotionWidget : public QWidget diff --git a/cockatrice/src/deck/deck_list_model.h b/cockatrice/src/deck/deck_list_model.h index cb074a55c..306ef12d5 100644 --- a/cockatrice/src/deck/deck_list_model.h +++ b/cockatrice/src/deck/deck_list_model.h @@ -1,8 +1,8 @@ #ifndef DECKLISTMODEL_H #define DECKLISTMODEL_H +#include "../../../common/deck_list/deck_list.h" #include "../game/cards/exact_card.h" -#include "decklist.h" #include #include diff --git a/cockatrice/src/deck/deck_loader.cpp b/cockatrice/src/deck/deck_loader.cpp index eef8461bc..f63f63383 100644 --- a/cockatrice/src/deck/deck_loader.cpp +++ b/cockatrice/src/deck/deck_loader.cpp @@ -1,9 +1,9 @@ #include "deck_loader.h" +#include "../../../common/deck_list/deck_list.h" #include "../game/cards/card_database.h" #include "../game/cards/card_database_manager.h" #include "../main.h" -#include "decklist.h" #include #include diff --git a/cockatrice/src/deck/deck_loader.h b/cockatrice/src/deck/deck_loader.h index cf83f24fb..1158c8bb2 100644 --- a/cockatrice/src/deck/deck_loader.h +++ b/cockatrice/src/deck/deck_loader.h @@ -1,7 +1,7 @@ #ifndef DECK_LOADER_H #define DECK_LOADER_H -#include "decklist.h" +#include "../../../common/deck_list/deck_list.h" #include diff --git a/cockatrice/src/deck/deck_stats_interface.cpp b/cockatrice/src/deck/deck_stats_interface.cpp index e95785fd6..4af97881b 100644 --- a/cockatrice/src/deck/deck_stats_interface.cpp +++ b/cockatrice/src/deck/deck_stats_interface.cpp @@ -1,6 +1,6 @@ #include "deck_stats_interface.h" -#include "decklist.h" +#include "../../../common/deck_list/deck_list.h" #include #include diff --git a/cockatrice/src/deck/deck_stats_interface.h b/cockatrice/src/deck/deck_stats_interface.h index c3611df81..3765ecd2c 100644 --- a/cockatrice/src/deck/deck_stats_interface.h +++ b/cockatrice/src/deck/deck_stats_interface.h @@ -1,8 +1,8 @@ #ifndef DECKSTATS_INTERFACE_H #define DECKSTATS_INTERFACE_H +#include "../../../common/deck_list/deck_list.h" #include "../game/cards/card_database.h" -#include "decklist.h" #include diff --git a/cockatrice/src/dialogs/dlg_create_token.cpp b/cockatrice/src/dialogs/dlg_create_token.cpp index 064c77fa1..56a88f5a1 100644 --- a/cockatrice/src/dialogs/dlg_create_token.cpp +++ b/cockatrice/src/dialogs/dlg_create_token.cpp @@ -1,11 +1,11 @@ #include "dlg_create_token.h" +#include "../../../common/deck_list/deck_list.h" #include "../client/ui/widgets/cards/card_info_picture_widget.h" #include "../game/cards/card_database_manager.h" #include "../game/cards/card_database_model.h" #include "../main.h" #include "../settings/cache_settings.h" -#include "decklist.h" #include "trice_limits.h" #include diff --git a/cockatrice/src/game/deckview/deck_view.cpp b/cockatrice/src/game/deckview/deck_view.cpp index 9be1c556e..b0be96a6b 100644 --- a/cockatrice/src/game/deckview/deck_view.cpp +++ b/cockatrice/src/game/deckview/deck_view.cpp @@ -1,9 +1,9 @@ #include "deck_view.h" +#include "../../../../common/deck_list/deck_list.h" #include "../../client/ui/theme_manager.h" #include "../../game/cards/card_info.h" #include "../../settings/cache_settings.h" -#include "decklist.h" #include #include diff --git a/common/CMakeLists.txt b/common/CMakeLists.txt index ff84ff5b9..1b8e2c4a1 100644 --- a/common/CMakeLists.txt +++ b/common/CMakeLists.txt @@ -6,7 +6,7 @@ add_subdirectory(pb) set(common_SOURCES debug_pb_message.cpp - decklist.cpp + deck_list/deck_list.cpp expression.cpp featureset.cpp get_pb_extension.cpp diff --git a/common/decklist.cpp b/common/deck_list/deck_list.cpp similarity index 99% rename from common/decklist.cpp rename to common/deck_list/deck_list.cpp index d040914c5..80cde7adf 100644 --- a/common/decklist.cpp +++ b/common/deck_list/deck_list.cpp @@ -1,4 +1,4 @@ -#include "decklist.h" +#include "deck_list.h" #include #include diff --git a/common/decklist.h b/common/deck_list/deck_list.h similarity index 99% rename from common/decklist.h rename to common/deck_list/deck_list.h index e5f2753cd..a29f1ca5c 100644 --- a/common/decklist.h +++ b/common/deck_list/deck_list.h @@ -1,7 +1,7 @@ #ifndef DECKLIST_H #define DECKLIST_H -#include "card_ref.h" +#include "../card_ref.h" #include #include diff --git a/common/server_game.cpp b/common/server_game.cpp index 95d97f1da..916775493 100644 --- a/common/server_game.cpp +++ b/common/server_game.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "server_game.h" -#include "decklist.h" +#include "deck_list/deck_list.h" #include "pb/context_connection_state_changed.pb.h" #include "pb/context_deck_select.pb.h" #include "pb/context_ping_changed.pb.h" diff --git a/common/server_player.cpp b/common/server_player.cpp index 67c5ef34c..6f0d7b59a 100644 --- a/common/server_player.cpp +++ b/common/server_player.cpp @@ -1,7 +1,7 @@ #include "server_player.h" #include "color.h" -#include "decklist.h" +#include "deck_list/deck_list.h" #include "get_pb_extension.h" #include "pb/command_attach_card.pb.h" #include "pb/command_change_zone_properties.pb.h" diff --git a/servatrice/src/servatrice.cpp b/servatrice/src/servatrice.cpp index 619586dad..058405ed7 100644 --- a/servatrice/src/servatrice.cpp +++ b/servatrice/src/servatrice.cpp @@ -19,7 +19,7 @@ ***************************************************************************/ #include "servatrice.h" -#include "decklist.h" +#include "../../common/deck_list/decklist.h" #include "email_parser.h" #include "featureset.h" #include "isl_interface.h" diff --git a/servatrice/src/servatrice_database_interface.cpp b/servatrice/src/servatrice_database_interface.cpp index 2a8b9d675..1337aebfe 100644 --- a/servatrice/src/servatrice_database_interface.cpp +++ b/servatrice/src/servatrice_database_interface.cpp @@ -1,6 +1,6 @@ #include "servatrice_database_interface.h" -#include "decklist.h" +#include "../../common/deck_list/decklist.h" #include "passwordhasher.h" #include "pb/game_replay.pb.h" #include "servatrice.h" diff --git a/servatrice/src/serversocketinterface.cpp b/servatrice/src/serversocketinterface.cpp index f0d4771a7..1c65c93cd 100644 --- a/servatrice/src/serversocketinterface.cpp +++ b/servatrice/src/serversocketinterface.cpp @@ -20,7 +20,7 @@ #include "serversocketinterface.h" -#include "decklist.h" +#include "../../common/deck_list/deck_list.h" #include "email_parser.h" #include "main.h" #include "pb/command_deck_del.pb.h" diff --git a/tests/loading_from_clipboard/CMakeLists.txt b/tests/loading_from_clipboard/CMakeLists.txt index 7b635a12d..caa7631be 100644 --- a/tests/loading_from_clipboard/CMakeLists.txt +++ b/tests/loading_from_clipboard/CMakeLists.txt @@ -1,6 +1,6 @@ add_definitions("-DCARDDB_DATADIR=\"${CMAKE_CURRENT_SOURCE_DIR}/data/\"") add_executable( - loading_from_clipboard_test ../../common/decklist.cpp clipboard_testing.cpp loading_from_clipboard_test.cpp + loading_from_clipboard_test ../../common/deck_list/deck_list.cpp clipboard_testing.cpp loading_from_clipboard_test.cpp ) if(NOT GTEST_FOUND) diff --git a/tests/loading_from_clipboard/clipboard_testing.h b/tests/loading_from_clipboard/clipboard_testing.h index 00d73b636..96fbf56fc 100644 --- a/tests/loading_from_clipboard/clipboard_testing.h +++ b/tests/loading_from_clipboard/clipboard_testing.h @@ -1,7 +1,7 @@ #ifndef CLIPBOARD_TESTING_H #define CLIPBOARD_TESTING_H -#include "../../common/decklist.h" +#include "../../common/deck_list/decklist.h" #include "gtest/gtest.h"