Move deck list to its own folder ahead of refactor.

Took 39 minutes
2026-07-14 14:32:15 -07:00 · 2025-09-04 22:08:22 +02:00 · 2025-09-04 22:08:22 +02:00 · 7f157496d3
commit 7f157496d3
parent da52d677c7
26 changed files with 26 additions and 26 deletions
--- 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"
--- 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 <QDesktopServices>
 #include <QMessageBox>
--- 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 <QLoggingCategory>
 #include <QObject>
--- 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 <QHBoxLayout>
 #include <QScrollArea>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <decklist.h>

 class DeckAnalyticsWidget : public QWidget
 {
--- 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 <QHash>
 #include <QRegularExpression>
-#include <decklist.h>

 ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel)
    : QWidget(parent), deckListModel(_deckListModel)
--- 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 <QHBoxLayout>
 #include <QWidget>
-#include <decklist.h>
 #include <utility>

 class ManaBaseWidget : public QWidget
--- 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 <decklist.h>
+#include <../../../../../common/deck_list/deck_list.h>
 #include <unordered_map>

 ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel)
--- 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 <decklist.h>
+#include <../../../../../common/deck_list/deck_list.h>
 #include <iostream>
 #include <regex>
 #include <string>
--- 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 <QHBoxLayout>
 #include <QWidget>
-#include <decklist.h>
 #include <utility>

 class ManaDevotionWidget : public QWidget
--- 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 <QAbstractItemModel>
 #include <QList>
--- 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 <QApplication>
 #include <QClipboard>
--- 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 <QLoggingCategory>

--- 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 <QDesktopServices>
 #include <QMessageBox>
--- 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 <QObject>

--- 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 <QCheckBox>
--- 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 <QApplication>
 #include <QGraphicsSceneMouseEvent>
--- 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
--- a/common/deck_list/deck_list.cpp
+++ b/common/deck_list/deck_list.cpp
@ -1,4 +1,4 @@
-#include "decklist.h"
+#include "deck_list.h"

 #include <QCryptographicHash>
 #include <QDebug>
--- a/common/deck_list/deck_list.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 <QMap>
 #include <QVector>
--- 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"
--- 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"
--- 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"
--- 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"
--- 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"
--- 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)
--- 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"