[Refactor] Move LoadedDeck and DeckFileFormat data types into libcockatrice_deck_list

cockatrice/CMakeLists.txt

@@ -24,9 +24,7 @@ set(cockatrice_SOURCES
     src/client/settings/shortcut_treeview.cpp
     src/client/settings/shortcuts_settings.cpp
     src/interface/deck_loader/card_node_function.cpp
-    src/interface/deck_loader/deck_file_format.cpp
     src/interface/deck_loader/deck_loader.cpp
-    src/interface/deck_loader/loaded_deck.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

cockatrice/src/filters/deck_filter_string.h

@@ -11,6 +11,7 @@
 #include <QString>
 #include <functional>
 #include <libcockatrice/card/card_localization.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 
 struct CardSearchLanguage;
 struct LoadedDeck;

cockatrice/src/game/player/player_logic.h

@@ -7,6 +7,8 @@
 #ifndef PLAYER_H
 #define PLAYER_H
 
+#include "../board/arrow_data.h"
+#include "../board/counter_state.h"
 #include "../zones/card_zone_logic.h"
 #include "../zones/hand_zone_logic.h"
 #include "../zones/pile_zone_logic.h"
@@ -22,6 +24,11 @@
 #include <QMap>
 #include <QObject>
 #include <QString>
+#include <QTimer>
+#include <libcockatrice/deck_list/loaded_deck.h>
+#include <libcockatrice/filters/filter_string.h>
+#include <libcockatrice/protocol/pb/card_attributes.pb.h>
+#include <libcockatrice/protocol/pb/game_event.pb.h>
 #include <libcockatrice/utility/zone_names.h>
 #include <qtmetamacros.h>
 

cockatrice/src/interface/deck_loader/deck_loader.h

@@ -7,13 +7,14 @@
 #ifndef DECK_LOADER_H
 #define DECK_LOADER_H
 
-#include "deck_file_format.h"
-#include "loaded_deck.h"
-
 #include <QLoggingCategory>
 #include <QObject>
+#include <QPrinter>
 #include <QString>
 #include <QStringList>
+#include <QTextCursor>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <optional>
 #include <qtmetamacros.h>
 

cockatrice/src/interface/intents/intent_open_local_deck.cpp

@@ -1,6 +1,5 @@
 #include "intent_open_local_deck.h"
 
-#include "../deck_loader/deck_file_format.h"
 #include "../deck_loader/deck_loader.h"
 #include "../deck_loader/loaded_deck.h"
 #include "../widgets/tabs/tab_supervisor.h"
@@ -9,6 +8,7 @@
 #include "libcockatrice/card/database/card_database_loader.h"
 
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_file_format.h>
 #include <optional>
 
 IntentOpenLocalDeck::IntentOpenLocalDeck(TabSupervisor *_tabSupervisor, const QString &_file)

cockatrice/src/interface/widgets/deck_editor/deck_state_manager.h

@@ -1,7 +1,7 @@
 #ifndef COCKATRICE_DECK_STATE_MANAGER_H
 #define COCKATRICE_DECK_STATE_MANAGER_H
 
-#include "../../deck_loader/loaded_deck.h"
+#include "deck_list_model.h"
 
 #include <QModelIndex>
 #include <QObject>
@@ -10,6 +10,7 @@
 #include <QStringList>
 #include <functional>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <qtmetamacros.h>
 
 class DeckListHistoryManager;

cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.h

@@ -10,8 +10,10 @@
 
 #include "libcockatrice/deck_list/deck_list.h"
 
+#include <QCheckBox>
 #include <QDialog>
 #include <QString>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <qtmetamacros.h>
 
 class QPlainTextEdit;

cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_model.h

@@ -13,7 +13,6 @@
 #ifndef VISUAL_DECK_STORAGE_MODEL_H
 #define VISUAL_DECK_STORAGE_MODEL_H
 
-#include "../../deck_loader/loaded_deck.h"
 #include "libcockatrice/utility/card_ref.h"
 
 #include <QAbstractListModel>
@@ -24,6 +23,9 @@
 #include <QString>
 #include <QStringList>
 #include <QVector>
+#include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
+#include <optional>
 #include <qnamespace.h>
 #include <qtmetamacros.h>
 

libcockatrice_deck_list/CMakeLists.txt

@@ -7,11 +7,13 @@ set(HEADERS
     libcockatrice/deck_list/tree/abstract_deck_list_node.h
     libcockatrice/deck_list/tree/deck_list_card_node.h
     libcockatrice/deck_list/tree/inner_deck_list_node.h
+    libcockatrice/deck_list/deck_file_format.h
     libcockatrice/deck_list/deck_list.h
     libcockatrice/deck_list/deck_list_history_manager.h
     libcockatrice/deck_list/deck_list_node_tree.h
     libcockatrice/deck_list/deck_list_memento.h
     libcockatrice/deck_list/deck_list_plain_text_parser.h
+    libcockatrice/deck_list/loaded_deck.h
     libcockatrice/deck_list/playmat_resolver.h
     libcockatrice/deck_list/sideboard_plan.h
 )
@@ -25,10 +27,12 @@ add_library(
   libcockatrice/deck_list/tree/abstract_deck_list_node.cpp
   libcockatrice/deck_list/tree/deck_list_card_node.cpp
   libcockatrice/deck_list/tree/inner_deck_list_node.cpp
+  libcockatrice/deck_list/deck_file_format.cpp
   libcockatrice/deck_list/deck_list.cpp
   libcockatrice/deck_list/deck_list_history_manager.cpp
   libcockatrice/deck_list/deck_list_node_tree.cpp
   libcockatrice/deck_list/deck_list_plain_text_parser.cpp
+  libcockatrice/deck_list/loaded_deck.cpp
   libcockatrice/deck_list/playmat_resolver.cpp
   libcockatrice/deck_list/sideboard_plan.cpp
 )