diff --git a/CMakeLists.txt b/CMakeLists.txt index b4e1c4c71..0af0823c8 100644 --- a/CMakeLists.txt +++ b/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}) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index bd14e3f4d..3308b2733 100644 --- a/cockatrice/CMakeLists.txt +++ b/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() diff --git a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h b/cockatrice/src/client/network/parsers/interface_json_deck_parser.h index 9b7b61283..91915c306 100644 --- a/cockatrice/src/client/network/parsers/interface_json_deck_parser.h +++ b/cockatrice/src/client/network/parsers/interface_json_deck_parser.h @@ -8,7 +8,7 @@ #define INTERFACE_JSON_DECK_PARSER_H #include #include -#include +#include class IJsonDeckParser { diff --git a/cockatrice/src/game/deckview/deck_view_container.cpp b/cockatrice/src/game/deckview/deck_view_container.cpp index 836438739..fc1c569b5 100644 --- a/cockatrice/src/game/deckview/deck_view_container.cpp +++ b/cockatrice/src/game/deckview/deck_view_container.cpp @@ -15,7 +15,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/cockatrice/src/game/deckview/deck_view_container.h b/cockatrice/src/game/deckview/deck_view_container.h index b61b21468..7f283527f 100644 --- a/cockatrice/src/game/deckview/deck_view_container.h +++ b/cockatrice/src/game/deckview/deck_view_container.h @@ -8,7 +8,7 @@ #define DECK_VIEW_CONTAINER_H #include -#include +#include class QVBoxLayout; class AbstractCardItem; diff --git a/cockatrice/src/game/dialogs/dlg_create_token.cpp b/cockatrice/src/game/dialogs/dlg_create_token.cpp index 736b5e55f..d2002b6e0 100644 --- a/cockatrice/src/game/dialogs/dlg_create_token.cpp +++ b/cockatrice/src/game/dialogs/dlg_create_token.cpp @@ -17,9 +17,9 @@ #include #include #include -#include -#include #include +#include +#include #include #include diff --git a/cockatrice/src/game/player/player_info.h b/cockatrice/src/game/player/player_info.h index a9353bf60..81f3f1487 100644 --- a/cockatrice/src/game/player/player_info.h +++ b/cockatrice/src/game/player/player_info.h @@ -14,7 +14,7 @@ #include "player_target.h" #include -#include +#include #include class PlayerInfo : public QObject diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp index 94f0e84bd..81bd52702 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.cpp +++ b/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 #include #include +#include +#include CardGroupDisplayWidget::CardGroupDisplayWidget(QWidget *parent, DeckListModel *_deckListModel, diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h index 914d234f0..a62a66803 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/card_group_display_widget.h @@ -15,7 +15,7 @@ #include #include #include -#include +#include class CardGroupDisplayWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp index 6d3e841ec..dad581874 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/flat_card_group_display_widget.cpp +++ b/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 #include #include +#include #include FlatCardGroupDisplayWidget::FlatCardGroupDisplayWidget(QWidget *parent, diff --git a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp index 82b5ec57b..4d8759cd8 100644 --- a/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/card_group_display_widgets/overlapped_card_group_display_widget.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include OverlappedCardGroupDisplayWidget::OverlappedCardGroupDisplayWidget(QWidget *parent, DeckListModel *_deckListModel, diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp index 419bdb648..be32d4f0e 100644 --- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp +++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.cpp @@ -5,7 +5,7 @@ #include #include -#include +#include DeckCardZoneDisplayWidget::DeckCardZoneDisplayWidget(QWidget *parent, DeckListModel *_deckListModel, diff --git a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h index 976493137..dbaeaa9ae 100644 --- a/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h +++ b/cockatrice/src/interface/widgets/cards/deck_card_zone_display_widget.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include class DeckCardZoneDisplayWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h index 3dc62d132..29dc9c33c 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/deck_analytics_widget.h @@ -17,7 +17,7 @@ #include #include #include -#include +#include class DeckAnalyticsWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp index f3bbb33fb..29fa3ece8 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include ManaBaseWidget::ManaBaseWidget(QWidget *parent, DeckListModel *_deckListModel) : QWidget(parent), deckListModel(_deckListModel) diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h index 9d661c319..e88fe3b85 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_base_widget.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include class ManaBaseWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp index 74a368496..e2067326a 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.cpp @@ -7,7 +7,7 @@ #include #include #include -#include +#include #include ManaCurveWidget::ManaCurveWidget(QWidget *parent, DeckListModel *_deckListModel) diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h index ced7727a5..7362e0c72 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_curve_widget.h @@ -11,7 +11,7 @@ #include #include -#include +#include #include class ManaCurveWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp index 09042b8f9..d23d6bfab 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.cpp @@ -8,7 +8,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h index b4daf8f6a..b8ec7950a 100644 --- a/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h +++ b/cockatrice/src/interface/widgets/deck_analytics/mana_devotion_widget.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include #include class ManaDevotionWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h index 542b2cb35..07f79dc55 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.h @@ -13,8 +13,8 @@ #include #include -#include -#include +#include +#include #include class AbstractTabDeckEditor; diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp index b68ec36eb..69eb71c2b 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.cpp @@ -6,7 +6,7 @@ #include #include #include -#include +#include #include DeckEditorFilterDockWidget::DeckEditorFilterDockWidget(AbstractTabDeckEditor *parent) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp index 5b18ad3bf..479e3b887 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_edit_tokens.cpp @@ -19,8 +19,8 @@ #include #include #include -#include -#include +#include +#include #include DlgEditTokens::DlgEditTokens(QWidget *parent) : QDialog(parent), currentCard(nullptr) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp index 9c37fbe50..47718e158 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck.cpp @@ -1,6 +1,6 @@ #include "dlg_load_deck.h" -#include +#include #include DlgLoadDeck::DlgLoadDeck(QWidget *parent) : QFileDialog(parent, tr("Load Deck")) diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp index 6ff31acbd..e15e7518f 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_load_deck_from_clipboard.cpp @@ -11,7 +11,7 @@ #include #include #include -#include +#include #include /** diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp index 564381496..50233e03b 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_manage_sets.cpp @@ -20,7 +20,7 @@ #include #include #include -#include +#include #include #define SORT_RESET -1 diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp index 7c1e33eea..a2c68410c 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp @@ -16,7 +16,7 @@ #include #include #include -#include +#include #include #include diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h index 278ffc2e4..93eb592c6 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h +++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.h @@ -16,7 +16,7 @@ #include #include #include -#include +#include class SetEntryWidget; // Forward declaration diff --git a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp index 89ca38b67..1c4ee30ab 100644 --- a/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp +++ b/cockatrice/src/interface/widgets/general/layout_containers/overlap_widget.cpp @@ -3,7 +3,7 @@ #include "../../../layouts/flow_layout.h" #include -#include +#include /** * @class OverlapWidget diff --git a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h index 9506f88ea..b16319da9 100644 --- a/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/all_zones_card_amount_widget.h @@ -11,8 +11,8 @@ #include #include -#include -#include +#include +#include class AllZonesCardAmountWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h index e4863be8a..8bb3b2ee5 100644 --- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.h @@ -17,8 +17,8 @@ #include #include #include -#include -#include +#include +#include class CardAmountWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h index 8fc924563..7da861d24 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include #define BATCH_SIZE 10 diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h index 197e1adda..931322117 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h +++ b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_display_widget.h @@ -14,7 +14,7 @@ #include #include #include -#include +#include class PrintingSelectorCardDisplayWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h b/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h index 8bc865920..1bafda4fe 100644 --- a/cockatrice/src/interface/widgets/printing_selector/printing_selector_card_overlay_widget.h +++ b/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 -#include +#include class PrintingSelectorCardOverlayWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp index bee9edcb3..631803092 100644 --- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp @@ -32,7 +32,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp index 0f1003a14..d525baafb 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.cpp @@ -5,7 +5,7 @@ #include #include #include -#include +#include void EdhrecDeckApiResponse::fromJson(const QJsonArray &json) { diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h index 9aa8ff821..2666789e9 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/api_response/average_deck/edhrec_deck_api_response.h @@ -12,7 +12,7 @@ #include #include #include -#include +#include class EdhrecDeckApiResponse { diff --git a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp index 97da51cc8..95754e8ad 100644 --- a/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp +++ b/cockatrice/src/interface/widgets/tabs/api/edhrec/tab_edhrec_main.cpp @@ -23,8 +23,8 @@ #include #include #include -#include -#include +#include +#include static bool canBeCommander(const CardInfoPtr &cardInfo) { diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp index 517254f80..034800158 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.cpp @@ -33,7 +33,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp index 165ee0a17..7ca0bad1f 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_storage.cpp @@ -18,7 +18,7 @@ #include #include #include -#include +#include #include #include #include diff --git a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h index a3b3d9713..fbc7062cc 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_supervisor.h +++ b/cockatrice/src/interface/widgets/tabs/tab_supervisor.h @@ -23,7 +23,7 @@ #include #include #include -#include +#include inline Q_LOGGING_CATEGORY(TabSupervisorLog, "tab_supervisor"); diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp index 5be62a94c..725a4e106 100644 --- a/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp +++ b/cockatrice/src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp @@ -27,8 +27,8 @@ #include #include #include -#include -#include +#include +#include #include #include #include diff --git a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp index 9dcb5500f..f3b271026 100644 --- a/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp +++ b/cockatrice/src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp @@ -6,7 +6,7 @@ #include #include -#include +#include #include TabDeckStorageVisual::TabDeckStorageVisual(TabSupervisor *_tabSupervisor) diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h index 0e7c89bab..898f5ccff 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.h @@ -28,8 +28,8 @@ #include #include #include -#include -#include +#include +#include #include #include diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp index ccf4a10ab..a2bd051ff 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp +++ b/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 -#include +#include #include #include diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h index 6aaa6ca23..751e16a3c 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.h @@ -13,7 +13,7 @@ #include #include #include -#include +#include class VisualDeckEditorSampleHandWidget : public QWidget { diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index d7efab3a7..d0f1bf034 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -16,11 +16,11 @@ #include #include #include -#include -#include -#include -#include -#include +#include +#include +#include +#include +#include #include VisualDeckEditorWidget::VisualDeckEditorWidget(QWidget *parent, DeckListModel *_deckListModel) diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h index 80e41c4f0..176086019 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_widget.h @@ -18,10 +18,10 @@ #include #include #include -#include -#include -#include -#include +#include +#include +#include +#include #include class DeckCardZoneDisplayWidget; diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h index ceb02b0f5..5f6059549 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h +++ b/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 -#include +#include inline bool confirmOverwriteIfExists(QWidget *parent, const QString &filePath); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h index e780f9369..154af3dfc 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.h @@ -18,7 +18,7 @@ #include #include #include -#include +#include class QMenu; class VisualDeckStorageWidget; diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h index 54bbc954f..f49d2544b 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_widget.h @@ -20,7 +20,7 @@ #include #include -#include +#include class QSpinBox; class VisualDeckStorageSearchWidget; diff --git a/libcockatrice_card/CMakeLists.txt b/libcockatrice_card/CMakeLists.txt index 7da560431..0d48bf535 100644 --- a/libcockatrice_card/CMakeLists.txt +++ b/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 diff --git a/libcockatrice_deck_list/CMakeLists.txt b/libcockatrice_deck_list/CMakeLists.txt index 0464d0f6a..0523343f6 100644 --- a/libcockatrice_deck_list/CMakeLists.txt +++ b/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} ) diff --git a/libcockatrice_models/CMakeLists.txt b/libcockatrice_models/CMakeLists.txt new file mode 100644 index 000000000..a9fc34bfd --- /dev/null +++ b/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}) diff --git a/libcockatrice_card/libcockatrice/card/database/model/card/card_completer_proxy_model.cpp b/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.cpp similarity index 100% rename from libcockatrice_card/libcockatrice/card/database/model/card/card_completer_proxy_model.cpp rename to libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.cpp diff --git a/libcockatrice_card/libcockatrice/card/database/model/card/card_completer_proxy_model.h b/libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h similarity index 100% rename from libcockatrice_card/libcockatrice/card/database/model/card/card_completer_proxy_model.h rename to libcockatrice_models/libcockatrice/models/database/card/card_completer_proxy_model.h diff --git a/libcockatrice_card/libcockatrice/card/database/model/card/card_search_model.cpp b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp similarity index 100% rename from libcockatrice_card/libcockatrice/card/database/model/card/card_search_model.cpp rename to libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp diff --git a/libcockatrice_card/libcockatrice/card/database/model/card/card_search_model.h b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h similarity index 100% rename from libcockatrice_card/libcockatrice/card/database/model/card/card_search_model.h rename to libcockatrice_models/libcockatrice/models/database/card/card_search_model.h diff --git a/libcockatrice_card/libcockatrice/card/database/model/card_database_display_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp similarity index 100% rename from libcockatrice_card/libcockatrice/card/database/model/card_database_display_model.cpp rename to libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp diff --git a/libcockatrice_card/libcockatrice/card/database/model/card_database_display_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h similarity index 100% rename from libcockatrice_card/libcockatrice/card/database/model/card_database_display_model.h rename to libcockatrice_models/libcockatrice/models/database/card_database_display_model.h diff --git a/libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp similarity index 98% rename from libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp rename to libcockatrice_models/libcockatrice/models/database/card_database_model.cpp index 6144121ac..e33156329 100644 --- a/libcockatrice_card/libcockatrice/card/database/model/card_database_model.cpp +++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.cpp @@ -1,8 +1,7 @@ #include "card_database_model.h" -#include "../card_database.h" - #include +#include #define CARDDBMODEL_COLUMNS 6 diff --git a/libcockatrice_card/libcockatrice/card/database/model/card_database_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_model.h similarity index 96% rename from libcockatrice_card/libcockatrice/card/database/model/card_database_model.h rename to libcockatrice_models/libcockatrice/models/database/card_database_model.h index fc89e0572..7c48c4e6d 100644 --- a/libcockatrice_card/libcockatrice/card/database/model/card_database_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card_database_model.h @@ -7,11 +7,10 @@ #ifndef CARDDATABASEMODEL_H #define CARDDATABASEMODEL_H -#include "../card_database.h" - #include #include #include +#include class CardDatabaseModel : public QAbstractListModel { diff --git a/libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp similarity index 100% rename from libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.cpp rename to libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.cpp diff --git a/libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.h b/libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h similarity index 100% rename from libcockatrice_card/libcockatrice/card/database/model/card_set/card_sets_model.h rename to libcockatrice_models/libcockatrice/models/database/card_set/card_sets_model.h diff --git a/libcockatrice_card/libcockatrice/card/database/model/token/token_display_model.cpp b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp similarity index 100% rename from libcockatrice_card/libcockatrice/card/database/model/token/token_display_model.cpp rename to libcockatrice_models/libcockatrice/models/database/token/token_display_model.cpp diff --git a/libcockatrice_card/libcockatrice/card/database/model/token/token_display_model.h b/libcockatrice_models/libcockatrice/models/database/token/token_display_model.h similarity index 100% rename from libcockatrice_card/libcockatrice/card/database/model/token/token_display_model.h rename to libcockatrice_models/libcockatrice/models/database/token/token_display_model.h diff --git a/libcockatrice_card/libcockatrice/card/database/model/token/token_edit_model.cpp b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp similarity index 89% rename from libcockatrice_card/libcockatrice/card/database/model/token/token_edit_model.cpp rename to libcockatrice_models/libcockatrice/models/database/token/token_edit_model.cpp index 8ce290b03..89a1f71b1 100644 --- a/libcockatrice_card/libcockatrice/card/database/model/token/token_edit_model.cpp +++ b/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 + TokenEditModel::TokenEditModel(QObject *parent) : CardDatabaseDisplayModel(parent) { } diff --git a/libcockatrice_card/libcockatrice/card/database/model/token/token_edit_model.h b/libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h similarity index 100% rename from libcockatrice_card/libcockatrice/card/database/model/token/token_edit_model.h rename to libcockatrice_models/libcockatrice/models/database/token/token_edit_model.h diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp similarity index 100% rename from libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.cpp rename to libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h similarity index 100% rename from libcockatrice_deck_list/libcockatrice/deck_list/deck_list_model.h rename to libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp similarity index 100% rename from libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.cpp rename to libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.cpp diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h similarity index 100% rename from libcockatrice_deck_list/libcockatrice/deck_list/deck_list_sort_filter_proxy_model.h rename to libcockatrice_models/libcockatrice/models/deck_list/deck_list_sort_filter_proxy_model.h diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_loader.cpp similarity index 100% rename from libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.cpp rename to libcockatrice_models/libcockatrice/models/deck_list/deck_loader.cpp diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_loader.h similarity index 100% rename from libcockatrice_deck_list/libcockatrice/deck_list/deck_loader.h rename to libcockatrice_models/libcockatrice/models/deck_list/deck_loader.h