[Refactor] Move LoadedDeck and DeckFileFormat data types into libcockatrice_deck_list (#7424)

Co-authored-by: Lukas Brübach <Bruebach.Lukas@bdosecurity.de>

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

@@ -1,7 +1,6 @@
 #include "deck_state_manager.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "deck_list_model.h"
 #include "libcockatrice/card/card_info.h"
 #include "libcockatrice/card/database/card_database_querier.h"
@@ -18,6 +17,7 @@
 #include <QVariant>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list_history_manager.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <qnamespace.h>

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_convert_deck_to_cod_format.cpp

@@ -1,7 +1,6 @@
 #include "dlg_convert_deck_to_cod_format.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/deck_file_format.h"
 
 #include <QCheckBox>
 #include <QDialogButtonBox>
@@ -12,6 +11,7 @@
 #include <QMessageBox>
 #include <QObject>
 #include <QVBoxLayout>
+#include <libcockatrice/deck_list/deck_file_format.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 #include <libcockatrice/utility/qt_utils.h>
 

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/general/home_widget.cpp

@@ -2,9 +2,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../interface/widgets/tabs/tab_supervisor.h"
-#include "../../deck_loader/deck_file_format.h"
 #include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../../pixel_map_generator.h"
 #include "../../theme_config.h"
 #include "../../theme_manager.h"
@@ -57,6 +55,8 @@
 #include <QtGlobal>
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_file_format.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/settings/appearance_settings.h>
 #include <libcockatrice/settings/paths_settings.h>

cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp

@@ -11,9 +11,7 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../../client/settings/shortcuts_settings.h"
-#include "../../deck_loader/deck_file_format.h"
 #include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../cards/additional_info/deck_color_identity.h"
 #include "../cards/card_info_frame_widget.h"
 #include "../client/network/interfaces/deck_stats_interface.h"
@@ -55,6 +53,8 @@
 #include <QUrl>
 #include <google/protobuf/stubs/port.h>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_file_format.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>

cockatrice/src/interface/widgets/tabs/api/archidekt/display/archidekt_api_response_deck_display_widget.cpp

@@ -2,7 +2,6 @@
 
 #include "../../../../../../client/settings/cache_settings.h"
 #include "../../../../../deck_loader/card_node_function.h"
-#include "../../../../../deck_loader/loaded_deck.h"
 #include "../../../../cards/deck_card_zone_display_widget.h"
 #include "../../../../visual_deck_editor/visual_deck_display_options_widget.h"
 #include "../../../../visual_deck_editor/visual_deck_editor_widget.h"
@@ -30,6 +29,7 @@
 #include <QVariant>
 #include <functional>
 #include <libcockatrice/card/import/card_name_normalizer.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 #include <libcockatrice/utility/qt_utils.h>
 #include <qlogging.h>

cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp

@@ -1,7 +1,6 @@
 #include "tab_edhrec_main.h"
 
 #include "../../../../../client/settings/cache_settings.h"
-#include "../../../../deck_loader/loaded_deck.h"
 #include "../../../cards/card_size_widget.h"
 #include "../../../quick_settings/settings_button_widget.h"
 #include "../../../utility/completer_utils.h"
@@ -28,6 +27,7 @@
 #include <QRegularExpression>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/card/database/card_database_querier.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/models/database/card/card_completer_proxy_model.h>
 #include <libcockatrice/models/database/card/card_search_model.h>
 #include <libcockatrice/models/database/card_database_display_model.h>

cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp

@@ -1,9 +1,7 @@
 #include "tab_deck_storage.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/deck_file_format.h"
 #include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../../pixel_map_generator.h"
 #include "../cards/additional_info/deck_color_identity.h"
 #include "../deck_share/deck_share_utils.h"
@@ -49,7 +47,9 @@
 #include <QtGlobal>
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_file_format.h>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/protocol/pb/command_deck_del.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_del_dir.pb.h>
 #include <libcockatrice/protocol/pb/command_deck_download.pb.h>

cockatrice/src/interface/widgets/tabs/tab_public_decks.cpp

@@ -2,7 +2,6 @@
 
 #include "../../../client/settings/cache_settings.h"
 #include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../cards/card_size_widget.h"
 #include "../general/layout_containers/flow_widget.h"
 #include "../visual_deck_storage/deck_preview/deck_preview_color_identity_filter_widget.h"
@@ -28,6 +27,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <functional>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_download_public.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>

cockatrice/src/interface/widgets/tabs/tab_supervisor.cpp

@@ -5,7 +5,6 @@
 #include "../../../game/abstract_game.h"
 #include "../../../game/game_event_handler.h"
 #include "../../../game/game_meta_info.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../../intents/contexts/context_connect_to_server.h"
 #include "../../intents/contexts/context_join_game.h"
 #include "../../intents/contexts/context_join_room.h"
@@ -63,6 +62,7 @@
 #include <QStyleOption>
 #include <QSystemTrayIcon>
 #include <QTabBar>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/network/client/remote/remote_client.h>
 #include <libcockatrice/protocol/pb/event_game_joined.pb.h>

cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp

@@ -2,7 +2,6 @@
 
 #include "../../../../client/settings/cache_settings.h"
 #include "../../../../client/settings/shortcuts_settings.h"
-#include "../../../deck_loader/loaded_deck.h"
 #include "../../deck_editor/deck_editor_card_database_dock_widget.h"
 #include "../../deck_editor/deck_editor_card_info_dock_widget.h"
 #include "../../deck_editor/deck_editor_deck_dock_widget.h"
@@ -44,6 +43,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <functional>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <libcockatrice/settings/deck_editor_settings.h>
 #include <libcockatrice/settings/layouts_settings.h>

cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp

@@ -1,9 +1,7 @@
 #include "tab_deck_storage_visual.h"
 
 #include "../../../../client/settings/cache_settings.h"
-#include "../../../deck_loader/deck_file_format.h"
 #include "../../../deck_loader/deck_loader.h"
-#include "../../../deck_loader/loaded_deck.h"
 #include "../../cards/additional_info/deck_color_identity.h"
 #include "../../deck_share/deck_share_utils.h"
 #include "../../deck_share/share_bar_widget.h"
@@ -17,7 +15,9 @@
 #include <QWidget>
 #include <QtGlobal>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_file_format.h>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pb/command_deck_share_create.pb.h>
 #include <libcockatrice/protocol/pb/response.pb.h>

cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.cpp

@@ -1,9 +1,7 @@
 #include "deck_preview_deck_tags_display_widget.h"
 
 #include "../../../../client/settings/cache_settings.h"
-#include "../../../deck_loader/deck_file_format.h"
 #include "../../../deck_loader/deck_loader.h"
-#include "../../../deck_loader/loaded_deck.h"
 #include "../../general/layout_containers/flow_widget.h"
 #include "deck_preview_tag_addition_widget.h"
 #include "deck_preview_tag_dialog.h"
@@ -16,6 +14,8 @@
 #include <QHBoxLayout>
 #include <QPointer>
 #include <QSizePolicy>
+#include <libcockatrice/deck_list/deck_file_format.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/settings/paths_settings.h>
 #include <libcockatrice/utility/qt_utils.h>
 #include <optional>

cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp

@@ -3,7 +3,6 @@
 #include "../../../../client/settings/cache_settings.h"
 #include "../../../../interface/widgets/dialogs/dlg_convert_deck_to_cod_format.h"
 #include "../../../deck_loader/deck_loader.h"
-#include "../../../deck_loader/loaded_deck.h"
 #include "../../cards/additional_info/color_identity_widget.h"
 #include "../../cards/deck_preview_card_picture_widget.h"
 #include "../visual_deck_storage_model.h"
@@ -45,6 +44,7 @@
 #include <compare>
 #include <functional>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/settings/visual_deck_storage_settings.h>
 #include <qnamespace.h>
 #include <utility>

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

@@ -1,8 +1,6 @@
 #include "visual_deck_storage_model.h"
 
-#include "../../deck_loader/deck_file_format.h"
 #include "../../deck_loader/deck_loader.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../cards/additional_info/deck_color_identity.h"
 #include "libcockatrice/deck_list/deck_list.h"
 
@@ -21,6 +19,8 @@
 #include <QtConcurrentRun>
 #include <compare>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/deck_list/deck_file_format.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/utility/card_ref.h>
 #include <optional>
 #include <utility>

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>
 

cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp

@@ -1,7 +1,6 @@
 #include "visual_deck_storage_sort_filter_proxy_model.h"
 
 #include "../../../client/settings/cache_settings.h"
-#include "../../deck_loader/loaded_deck.h"
 #include "../../filters/deck_filter_string.h"
 #include "visual_deck_storage_model.h"
 
@@ -16,6 +15,7 @@
 #include <algorithm>
 #include <compare>
 #include <libcockatrice/card/card_localization.h>
+#include <libcockatrice/deck_list/loaded_deck.h>
 #include <libcockatrice/settings/cards_display_settings.h>
 
 VisualDeckStorageSortFilterProxyModel::VisualDeckStorageSortFilterProxyModel(QObject *parent)