Move models to lib (#6274)

* Move models to own library.

Took 35 minutes


Took 22 minutes

* Adjust CMakeLists

Took 20 seconds

* Reformat CMakeLists.

Took 2 minutes

* Revert "Reformat CMakeLists."

This reverts commit db5982ad1c.


Took 55 seconds

* Lint an include

Took 17 minutes

Took 9 seconds

---------

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

CMakeLists.txt

@@ -335,6 +335,7 @@ add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_rng ${CMAKE_BINARY_DIR}/libco
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_settings ${CMAKE_BINARY_DIR}/libcockatrice_settings)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_card ${CMAKE_BINARY_DIR}/libcockatrice_card)
 add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_utility ${CMAKE_BINARY_DIR}/libcockatrice_utility)
+add_subdirectory(${CMAKE_SOURCE_DIR}/libcockatrice_models ${CMAKE_BINARY_DIR}/libcockatrice_models)
 if(WITH_SERVER)
   add_subdirectory(servatrice)
   set(CPACK_INSTALL_CMAKE_PROJECTS "Servatrice;Servatrice;ALL;/" ${CPACK_INSTALL_CMAKE_PROJECTS})

cockatrice/CMakeLists.txt

@@ -360,13 +360,20 @@ if(Qt5_FOUND)
     libcockatrice_deck_list
     libcockatrice_utility
     libcockatrice_network
+    libcockatrice_models
     libcockatrice_rng
     ${COCKATRICE_QT_MODULES}
   )
 else()
   target_link_libraries(
-    cockatrice PUBLIC libcockatrice_card libcockatrice_deck_list libcockatrice_utility libcockatrice_network
-                      libcockatrice_rng ${COCKATRICE_QT_MODULES}
+    cockatrice
+    PUBLIC libcockatrice_card
+           libcockatrice_deck_list
+           libcockatrice_utility
+           libcockatrice_network
+           libcockatrice_models
+           libcockatrice_rng
+           ${COCKATRICE_QT_MODULES}
   )
 endif()
 

cockatrice/src/client/network/parsers/interface_json_deck_parser.h

@@ -8,7 +8,7 @@
 #define INTERFACE_JSON_DECK_PARSER_H
 #include <QJsonArray>
 #include <QJsonObject>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 
 class IJsonDeckParser
 {

cockatrice/src/game/deckview/deck_view_container.cpp

@@ -15,7 +15,7 @@
 #include <google/protobuf/descriptor.h>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <libcockatrice/protocol/pb/command_deck_select.pb.h>
 #include <libcockatrice/protocol/pb/command_ready_start.pb.h>
 #include <libcockatrice/protocol/pb/command_set_sideboard_lock.pb.h>

cockatrice/src/game/deckview/deck_view_container.h

@@ -8,7 +8,7 @@
 #define DECK_VIEW_CONTAINER_H
 
 #include <QPushButton>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 
 class QVBoxLayout;
 class AbstractCardItem;

cockatrice/src/game/dialogs/dlg_create_token.cpp

@@ -17,9 +17,9 @@
 #include <QTreeView>
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/database/model/card_database_model.h>
-#include <libcockatrice/card/database/model/token/token_display_model.h>
 #include <libcockatrice/deck_list/deck_list.h>
+#include <libcockatrice/models/database/card_database_model.h>
+#include <libcockatrice/models/database/token/token_display_model.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <libcockatrice/utility/trice_limits.h>
 

cockatrice/src/game/player/player_info.h

@@ -14,7 +14,7 @@
 #include "player_target.h"
 
 #include <QObject>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <libcockatrice/protocol/pb/serverinfo_user.pb.h>
 
 class PlayerInfo : public QObject

cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp

@@ -1,12 +1,12 @@
 #include "card_group_display_widget.h"
 
 #include "../card_info_picture_with_text_overlay_widget.h"
-#include "../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h"
-#include "../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h"
 
 #include <QResizeEvent>
 #include <libcockatrice/card/card_info_comparator.h>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h>
 
 CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent,
                                                DeckListModel *_deckListModel,

cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h

@@ -15,7 +15,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class CardGroupDisplayWidget : public QWidget
 {

cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp

@@ -1,11 +1,11 @@
 #include "flat_card_group_display_widget.h"
 
 #include "../card_info_picture_with_text_overlay_widget.h"
-#include "../libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h"
 
 #include <QResizeEvent>
 #include <libcockatrice/card/card_info_comparator.h>
 #include <libcockatrice/card/database/card_database_manager.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <utility>
 
 FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent,

cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp

@@ -5,7 +5,7 @@
 #include <QResizeEvent>
 #include <libcockatrice/card/card_info_comparator.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent,
                                                                    DeckListModel *_deckListModel,

cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp

@@ -5,7 +5,7 @@
 
 #include <QResizeEvent>
 #include <libcockatrice/card/card_info_comparator.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent,
                                                      DeckListModel *_deckListModel,

cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h

@@ -17,7 +17,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class DeckCardZoneDisplayWidget : public QWidget
 {

cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h

@@ -17,7 +17,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class DeckAnalyticsWidget : public QWidget
 {

cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp

@@ -8,7 +8,7 @@
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 
 ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel)
     : QWidget(parent), deckListModel(_deckListModel)

cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h

@@ -12,7 +12,7 @@
 #include <QHBoxLayout>
 #include <QWidget>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <utility>
 
 class ManaBaseWidget : public QWidget

cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp

@@ -7,7 +7,7 @@
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <unordered_map>
 
 ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel)

cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h

@@ -11,7 +11,7 @@
 
 #include <QHBoxLayout>
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <unordered_map>
 
 class ManaCurveWidget : public QWidget

cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp

@@ -8,7 +8,7 @@
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <regex>
 #include <string>
 #include <unordered_map>

cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h

@@ -12,7 +12,7 @@
 #include <QHBoxLayout>
 #include <QWidget>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <utility>
 
 class ManaDevotionWidget : public QWidget

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

@@ -13,8 +13,8 @@
 
 #include <QHBoxLayout>
 #include <QWidget>
-#include <libcockatrice/card/database/model/card_database_display_model.h>
-#include <libcockatrice/card/database/model/card_database_model.h>
+#include <libcockatrice/models/database/card_database_display_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/utility/key_signals.h>
 
 class AbstractTabDeckEditor;

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

@@ -6,7 +6,7 @@
 #include <QGridLayout>
 #include <QMenu>
 #include <QToolButton>
-#include <libcockatrice/card/database/model/card_database_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent)

cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp

@@ -19,8 +19,8 @@
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/database/model/card_database_model.h>
-#include <libcockatrice/card/database/model/token/token_edit_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
+#include <libcockatrice/models/database/token/token_edit_model.h>
 #include <libcockatrice/utility/trice_limits.h>
 
 DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr)

cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp

@@ -1,6 +1,6 @@
 #include "dlg_load_deck.h"
 
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck"))

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

@@ -11,7 +11,7 @@
 #include <QPushButton>
 #include <QTextStream>
 #include <QVBoxLayout>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 /**

cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp

@@ -20,7 +20,7 @@
 #include <QTreeView>
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/database/model/card_set/card_sets_model.h>
+#include <libcockatrice/models/database/card_set/card_sets_model.h>
 #include <libcockatrice/settings/cache_settings.h>
 
 #define SORT_RESET -1

cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp

@@ -16,7 +16,7 @@
 #include <QVBoxLayout>
 #include <algorithm>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <qdrag.h>
 #include <qevent.h>
 

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

@@ -16,7 +16,7 @@
 #include <QMap>
 #include <QScrollArea>
 #include <QVBoxLayout>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class SetEntryWidget; // Forward declaration
 

cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp

@@ -3,7 +3,7 @@
 #include "../../../layouts/flow_layout.h"
 
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 /**
  * @class OverlapWidget

cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h

@@ -11,8 +11,8 @@
 
 #include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_list_model.h>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 
 class AllZonesCardAmountWidget : public QWidget
 {

cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h

@@ -17,8 +17,8 @@
 #include <QTreeView>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 
 class CardAmountWidget : public QWidget
 {

cockatrice/src/interface/widgets/printing_selector/printing_selector.h

@@ -18,7 +18,7 @@
 #include <QVBoxLayout>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 #define BATCH_SIZE 10
 

cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h

@@ -14,7 +14,7 @@
 #include <QPainter>
 #include <QWidget>
 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class PrintingSelectorCardDisplayWidget : public QWidget
 {

cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h

@@ -14,7 +14,7 @@
 #include "set_name_and_collectors_number_display_widget.h"
 
 #include <libcockatrice/card/card_info.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class PrintingSelectorCardOverlayWidget : public QWidget
 {

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

@@ -32,7 +32,7 @@
 #include <QTreeView>
 #include <QUrl>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/database/model/card_database_model.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>
 #include <libcockatrice/protocol/pb/response.pb.h>

cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp

@@ -5,7 +5,7 @@
 #include <QJsonArray>
 #include <QJsonObject>
 #include <QMainWindow>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 
 void EdhrecDeckApiResponse::fromJson(const QJsonArray &json)
 {

cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h

@@ -12,7 +12,7 @@
 #include <QJsonObject>
 #include <QString>
 #include <QVector>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 
 class EdhrecDeckApiResponse
 {

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

@@ -23,8 +23,8 @@
 #include <QRegularExpression>
 #include <QResizeEvent>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/database/model/card/card_completer_proxy_model.h>
-#include <libcockatrice/card/database/model/card/card_search_model.h>
+#include <libcockatrice/models/database/card/card_completer_proxy_model.h>
+#include <libcockatrice/models/database/card/card_search_model.h>
 
 static bool canBeCommander(const CardInfoPtr &cardInfo)
 {

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

@@ -33,7 +33,7 @@
 #include <QTreeView>
 #include <QVBoxLayout>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/database/model/card_database_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/network/client/abstract/abstract_client.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cache_settings.h>

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

@@ -18,7 +18,7 @@
 #include <QUrl>
 #include <QVBoxLayout>
 #include <libcockatrice/deck_list/deck_list.h>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.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_supervisor.h

@@ -23,7 +23,7 @@
 #include <QMap>
 #include <QProxyStyle>
 #include <QTabWidget>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 
 inline Q_LOGGING_CATEGORY(TabSupervisorLog, "tab_supervisor");
 

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

@@ -27,8 +27,8 @@
 #include <QTimer>
 #include <QTreeView>
 #include <QVBoxLayout>
-#include <libcockatrice/card/database/model/card_database_model.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <libcockatrice/protocol/pb/command_deck_upload.pb.h>
 #include <libcockatrice/protocol/pending_command.h>
 #include <libcockatrice/settings/cache_settings.h>

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

@@ -6,7 +6,7 @@
 
 #include <QMessageBox>
 #include <QMouseEvent>
-#include <libcockatrice/card/database/model/card_database_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
 #include <libcockatrice/protocol/pb/command_deck_del.pb.h>
 
 TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor)

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h

@@ -28,8 +28,8 @@
 #include <QWheelEvent>
 #include <QWidget>
 #include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/model/card_database_model.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <libcockatrice/utility/key_signals.h>
 #include <qscrollarea.h>
 

cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp

@@ -3,7 +3,7 @@
 #include "../cards/card_info_picture_widget.h"
 
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <libcockatrice/settings/cache_settings.h>
 #include <random>
 

cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h

@@ -13,7 +13,7 @@
 #include <QPushButton>
 #include <QSpinBox>
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class VisualDeckEditorSampleHandWidget : public QWidget
 {

cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp

@@ -16,11 +16,11 @@
 #include <libcockatrice/card/card_info_comparator.h>
 #include <libcockatrice/card/database/card_database.h>
 #include <libcockatrice/card/database/card_database_manager.h>
-#include <libcockatrice/card/database/model/card/card_completer_proxy_model.h>
-#include <libcockatrice/card/database/model/card/card_search_model.h>
-#include <libcockatrice/card/database/model/card_database_model.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
-#include <libcockatrice/deck_list/deck_loader.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_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 #include <qscrollarea.h>
 
 VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_deckListModel)

cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h

@@ -18,10 +18,10 @@
 #include <QPushButton>
 #include <QWidget>
 #include <libcockatrice/card/database/card_database.h>
-#include <libcockatrice/card/database/model/card/card_completer_proxy_model.h>
-#include <libcockatrice/card/database/model/card_database_display_model.h>
-#include <libcockatrice/card/database/model/card_database_model.h>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/database/card/card_completer_proxy_model.h>
+#include <libcockatrice/models/database/card_database_display_model.h>
+#include <libcockatrice/models/database/card_database_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 #include <qscrollarea.h>
 
 class DeckCardZoneDisplayWidget;

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

@@ -10,7 +10,7 @@
 #include "deck_preview_widget.h"
 
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 
 inline bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath);
 

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

@@ -18,7 +18,7 @@
 #include <QEvent>
 #include <QVBoxLayout>
 #include <QWidget>
-#include <libcockatrice/deck_list/deck_loader.h>
+#include <libcockatrice/models/deck_list/deck_loader.h>
 
 class QMenu;
 class VisualDeckStorageWidget;

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

@@ -20,7 +20,7 @@
 
 #include <QCheckBox>
 #include <QFileSystemModel>
-#include <libcockatrice/deck_list/deck_list_model.h>
+#include <libcockatrice/models/deck_list/deck_list_model.h>
 
 class QSpinBox;
 class VisualDeckStorageSearchWidget;

libcockatrice_card/CMakeLists.txt

@@ -9,13 +9,6 @@ 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/model/card_database_model.h
-    libcockatrice/card/database/model/card_database_display_model.h
-    libcockatrice/card/database/model/card/card_completer_proxy_model.h
-    libcockatrice/card/database/model/card/card_search_model.h
-    libcockatrice/card/database/model/card_set/card_sets_model.h
-    libcockatrice/card/database/model/token/token_display_model.h
-    libcockatrice/card/database/model/token/token_edit_model.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
@@ -40,13 +33,6 @@ add_library(
   libcockatrice/card/database/card_database_loader.cpp
   libcockatrice/card/database/card_database_manager.cpp
   libcockatrice/card/database/card_database_querier.cpp
-  libcockatrice/card/database/model/card/card_completer_proxy_model.cpp
-  libcockatrice/card/database/model/card/card_search_model.cpp
-  libcockatrice/card/database/model/card_set/card_sets_model.cpp
-  libcockatrice/card/database/model/card_database_display_model.cpp
-  libcockatrice/card/database/model/card_database_model.cpp
-  libcockatrice/card/database/model/token/token_display_model.cpp
-  libcockatrice/card/database/model/token/token_edit_model.cpp
   libcockatrice/card/database/parser/card_database_parser.cpp
   libcockatrice/card/database/parser/cockatrice_xml_3.cpp
   libcockatrice/card/database/parser/cockatrice_xml_4.cpp

libcockatrice_deck_list/CMakeLists.txt

@@ -3,13 +3,8 @@ set(CMAKE_AUTOUIC ON)
 set(CMAKE_AUTORCC ON)
 
 set(HEADERS
-    libcockatrice/deck_list/abstract_deck_list_card_node.h
-    libcockatrice/deck_list/abstract_deck_list_node.h
-    libcockatrice/deck_list/deck_list.h
-    libcockatrice/deck_list/deck_list_card_node.h
-    libcockatrice/deck_list/deck_list_model.h
-    libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h
-    libcockatrice/deck_list/deck_loader.h
+    libcockatrice/deck_list/abstract_deck_list_card_node.h libcockatrice/deck_list/abstract_deck_list_node.h
+    libcockatrice/deck_list/deck_list.h libcockatrice/deck_list/deck_list_card_node.h
     libcockatrice/deck_list/inner_deck_list_node.h
 )
 
@@ -21,15 +16,9 @@ endif()
 
 add_library(
   libcockatrice_deck_list STATIC
-  ${MOC_SOURCES}
-  libcockatrice/deck_list/abstract_deck_list_card_node.cpp
-  libcockatrice/deck_list/abstract_deck_list_node.cpp
-  libcockatrice/deck_list/deck_list.cpp
-  libcockatrice/deck_list/deck_list_card_node.cpp
-  libcockatrice/deck_list/deck_list_model.cpp
-  libcockatrice/deck_list/deck_list_sort_filter_proxy_model.cpp
-  libcockatrice/deck_list/deck_loader.cpp
-  libcockatrice/deck_list/inner_deck_list_node.cpp
+  ${MOC_SOURCES} libcockatrice/deck_list/abstract_deck_list_card_node.cpp
+  libcockatrice/deck_list/abstract_deck_list_node.cpp libcockatrice/deck_list/deck_list.cpp
+  libcockatrice/deck_list/deck_list_card_node.cpp libcockatrice/deck_list/inner_deck_list_node.cpp
 )
 
 add_dependencies(libcockatrice_deck_list libcockatrice_protocol)
@@ -37,6 +26,5 @@ add_dependencies(libcockatrice_deck_list libcockatrice_protocol)
 target_include_directories(libcockatrice_deck_list PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
 
 target_link_libraries(
-  libcockatrice_deck_list PUBLIC libcockatrice_protocol libcockatrice_card libcockatrice_utility
-                                 ${COCKATRICE_QT_MODULES}
+  libcockatrice_deck_list PUBLIC libcockatrice_protocol libcockatrice_utility ${COCKATRICE_QT_MODULES}
 )

libcockatrice_models/CMakeLists.txt

@@ -0,0 +1,41 @@
+set(CMAKE_AUTOMOC ON)
+set(CMAKE_AUTOUIC ON)
+set(CMAKE_AUTORCC ON)
+
+set(HEADERS
+    libcockatrice/models/database/card_database_model.h
+    libcockatrice/models/database/card_database_display_model.h
+    libcockatrice/models/database/card/card_completer_proxy_model.h
+    libcockatrice/models/database/card/card_search_model.h
+    libcockatrice/models/database/card_set/card_sets_model.h
+    libcockatrice/models/database/token/token_display_model.h
+    libcockatrice/models/database/token/token_edit_model.h
+    libcockatrice/models/deck_list/deck_list_model.h
+    libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h
+    libcockatrice/models/deck_list/deck_loader.h
+)
+
+if(Qt6_FOUND)
+  qt6_wrap_cpp(MOC_SOURCES ${HEADERS})
+elseif(Qt5_FOUND)
+  qt5_wrap_cpp(MOC_SOURCES ${HEADERS})
+endif()
+
+add_library(
+  libcockatrice_models STATIC
+  ${MOC_SOURCES}
+  libcockatrice/models/database/card_database_model.cpp
+  libcockatrice/models/database/card_database_display_model.cpp
+  libcockatrice/models/database/card/card_completer_proxy_model.cpp
+  libcockatrice/models/database/card/card_search_model.cpp
+  libcockatrice/models/database/card_set/card_sets_model.cpp
+  libcockatrice/models/database/token/token_display_model.cpp
+  libcockatrice/models/database/token/token_edit_model.cpp
+  libcockatrice/models/deck_list/deck_list_model.cpp
+  libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp
+  libcockatrice/models/deck_list/deck_loader.cpp
+)
+
+target_include_directories(libcockatrice_models PUBLIC ${CMAKE_CURRENT_SOURCE_DIR})
+
+target_link_libraries(libcockatrice_models PUBLIC libcockatrice_card libcockatrice_deck_list ${COCKATRICE_QT_MODULES})

libcockatrice_models/libcockatrice/models/database/card_database_model.cpp

@@ -1,8 +1,7 @@
 #include "card_database_model.h"
 
-#include "../card_database.h"
-
 #include <QMap>
+#include <libcockatrice/card/database/card_database.h>
 
 #define CARDDBMODEL_COLUMNS 6
 

libcockatrice_models/libcockatrice/models/database/card_database_model.h

@@ -7,11 +7,10 @@
 #ifndef CARDDATABASEMODEL_H
 #define CARDDATABASEMODEL_H
 
-#include "../card_database.h"
-
 #include <QAbstractListModel>
 #include <QList>
 #include <QSet>
+#include <libcockatrice/card/database/card_database.h>
 
 class CardDatabaseModel : public QAbstractListModel
 {

libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp

@@ -1,9 +1,10 @@
-#include "../token/token_edit_model.h"
+#include "token_edit_model.h"
 
-#include "../../../card_info.h"
 #include "../card_database_display_model.h"
 #include "../card_database_model.h"
 
+#include <libcockatrice/card/card_info.h>
+
 TokenEditModel::TokenEditModel(QObject *parent) : CardDatabaseDisplayModel(parent)
 {
 }