From aa61032cdfd806c337c4e93a983fdadbea632e64 Mon Sep 17 00:00:00 2001 From: tooomm Date: Mon, 3 Nov 2025 18:32:35 +0100 Subject: [PATCH 1/5] Delete servatrice/scripts/mk_pypb.sh (#6267) See https://github.com/Cockatrice/Cockatrice/pull/6212#issuecomment-3447840864 --- servatrice/scripts/mk_pypb.sh | 10 ---------- 1 file changed, 10 deletions(-) delete mode 100755 servatrice/scripts/mk_pypb.sh diff --git a/servatrice/scripts/mk_pypb.sh b/servatrice/scripts/mk_pypb.sh deleted file mode 100755 index e11d237d2..000000000 --- a/servatrice/scripts/mk_pypb.sh +++ /dev/null @@ -1,10 +0,0 @@ -#!/bin/bash - -SRC_DIR=../../common/pb/ -DST_DIR=./pypb - -rm -rf "$DST_DIR" -mkdir -p "$DST_DIR" -protoc -I=$SRC_DIR --python_out=$DST_DIR $SRC_DIR/*.proto -touch "$DST_DIR/__init__.py" - From 1c209b3320cf71e12a97100d384a44fc602885d5 Mon Sep 17 00:00:00 2001 From: RickyRister <42636155+RickyRister@users.noreply.github.com> Date: Mon, 3 Nov 2025 09:55:32 -0800 Subject: [PATCH 2/5] Fix names in qtlogging.ini (#6265) --- cockatrice/resources/config/qtlogging.ini | 10 ++++++---- cockatrice/src/game/game_event_handler.h | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-) diff --git a/cockatrice/resources/config/qtlogging.ini b/cockatrice/resources/config/qtlogging.ini index d5a96f6c3..083d7234e 100644 --- a/cockatrice/resources/config/qtlogging.ini +++ b/cockatrice/resources/config/qtlogging.ini @@ -37,12 +37,14 @@ #card_zone = true #view_zone = true +#game_event_handler = true + #user_info_connection = true -#picture_loader = true -#picture_loader.worker = true -#picture_loader.card_back_cache_fail = true -#picture_loader.picture_to_load = true +#card_picture_loader = true +#card_picture_loader.worker = true +#card_picture_loader.card_back_cache_fail = true +#card_picture_loader.picture_to_load = true #deck_loader = true #card_database = true #card_database.loading = true diff --git a/cockatrice/src/game/game_event_handler.h b/cockatrice/src/game/game_event_handler.h index 2709cdcd5..302e7a6ff 100644 --- a/cockatrice/src/game/game_event_handler.h +++ b/cockatrice/src/game/game_event_handler.h @@ -40,7 +40,7 @@ class AbstractGame; class PendingCommand; class Player; -inline Q_LOGGING_CATEGORY(GameEventHandlerLog, "tab_game"); +inline Q_LOGGING_CATEGORY(GameEventHandlerLog, "game_event_handler"); class GameEventHandler : public QObject { From d91466723887720586563f3e50312d73eb01a444 Mon Sep 17 00:00:00 2001 From: ebbit1q Date: Wed, 5 Nov 2025 12:10:36 +0100 Subject: [PATCH 3/5] fix qt 6.10 debug build (#6271) * fix qt 6.10 build * fix games model parameter order and correct parameter names * add missing include for qt5 --- .../widgets/server/game_selector.cpp | 23 +-- .../interface/widgets/server/games_model.cpp | 163 +++++------------- .../interface/widgets/server/games_model.h | 33 ++-- .../interface/widgets/tabs/tab_replays.cpp | 5 +- .../card/database/card_database_loader.cpp | 5 +- .../model/card_database_display_model.cpp | 9 +- .../settings/game_filters_settings.h | 5 +- .../libcockatrice/utility/logger.cpp | 6 +- 8 files changed, 89 insertions(+), 160 deletions(-) diff --git a/cockatrice/src/interface/widgets/server/game_selector.cpp b/cockatrice/src/interface/widgets/server/game_selector.cpp index e3fa1b64f..8aa3211bd 100644 --- a/cockatrice/src/interface/widgets/server/game_selector.cpp +++ b/cockatrice/src/interface/widgets/server/game_selector.cpp @@ -155,22 +155,13 @@ void GameSelector::actSetFilter() if (!dlg.exec()) return; - gameListProxyModel->setHideBuddiesOnlyGames(dlg.getHideBuddiesOnlyGames()); - gameListProxyModel->setHideFullGames(dlg.getHideFullGames()); - gameListProxyModel->setHideGamesThatStarted(dlg.getHideGamesThatStarted()); - gameListProxyModel->setHidePasswordProtectedGames(dlg.getHidePasswordProtectedGames()); - gameListProxyModel->setHideIgnoredUserGames(dlg.getHideIgnoredUserGames()); - gameListProxyModel->setHideNotBuddyCreatedGames(dlg.getHideNotBuddyCreatedGames()); - gameListProxyModel->setHideOpenDecklistGames(dlg.getHideOpenDecklistGames()); - gameListProxyModel->setGameNameFilter(dlg.getGameNameFilter()); - gameListProxyModel->setCreatorNameFilter(dlg.getCreatorNameFilter()); - gameListProxyModel->setGameTypeFilter(dlg.getGameTypeFilter()); - gameListProxyModel->setMaxPlayersFilter(dlg.getMaxPlayersFilterMin(), dlg.getMaxPlayersFilterMax()); - gameListProxyModel->setMaxGameAge(dlg.getMaxGameAge()); - gameListProxyModel->setShowOnlyIfSpectatorsCanWatch(dlg.getShowOnlyIfSpectatorsCanWatch()); - gameListProxyModel->setShowSpectatorPasswordProtected(dlg.getShowSpectatorPasswordProtected()); - gameListProxyModel->setShowOnlyIfSpectatorsCanChat(dlg.getShowOnlyIfSpectatorsCanChat()); - gameListProxyModel->setShowOnlyIfSpectatorsCanSeeHands(dlg.getShowOnlyIfSpectatorsCanSeeHands()); + gameListProxyModel->setGameFilters( + dlg.getHideBuddiesOnlyGames(), dlg.getHideIgnoredUserGames(), dlg.getHideFullGames(), + dlg.getHideGamesThatStarted(), dlg.getHidePasswordProtectedGames(), dlg.getHideNotBuddyCreatedGames(), + dlg.getHideOpenDecklistGames(), dlg.getGameNameFilter(), dlg.getCreatorNameFilter(), dlg.getGameTypeFilter(), + dlg.getMaxPlayersFilterMin(), dlg.getMaxPlayersFilterMax(), dlg.getMaxGameAge(), + dlg.getShowOnlyIfSpectatorsCanWatch(), dlg.getShowSpectatorPasswordProtected(), + dlg.getShowOnlyIfSpectatorsCanChat(), dlg.getShowOnlyIfSpectatorsCanSeeHands()); gameListProxyModel->saveFilterParameters(gameTypeMap); clearFilterButton->setEnabled(!gameListProxyModel->areFilterParametersSetToDefaults()); diff --git a/cockatrice/src/interface/widgets/server/games_model.cpp b/cockatrice/src/interface/widgets/server/games_model.cpp index f05d47efe..8c9e2c723 100644 --- a/cockatrice/src/interface/widgets/server/games_model.cpp +++ b/cockatrice/src/interface/widgets/server/games_model.cpp @@ -286,101 +286,49 @@ GamesProxyModel::GamesProxyModel(QObject *parent, const UserListProxy *_userList setDynamicSortFilter(true); } -void GamesProxyModel::setHideBuddiesOnlyGames(bool _showBuddiesOnlyGames) -{ - hideBuddiesOnlyGames = _showBuddiesOnlyGames; - invalidateFilter(); -} - -void GamesProxyModel::setHideIgnoredUserGames(bool _hideIgnoredUserGames) +void GamesProxyModel::setGameFilters(bool _hideBuddiesOnlyGames, + bool _hideIgnoredUserGames, + bool _hideFullGames, + bool _hideGamesThatStarted, + bool _hidePasswordProtectedGames, + bool _hideNotBuddyCreatedGames, + bool _hideOpenDecklistGames, + const QString &_gameNameFilter, + const QString &_creatorNameFilter, + const QSet &_gameTypeFilter, + int _maxPlayersFilterMin, + int _maxPlayersFilterMax, + const QTime &_maxGameAge, + bool _showOnlyIfSpectatorsCanWatch, + bool _showSpectatorPasswordProtected, + bool _showOnlyIfSpectatorsCanChat, + bool _showOnlyIfSpectatorsCanSeeHands) { +#if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)) + beginFilterChange(); +#endif + hideBuddiesOnlyGames = _hideBuddiesOnlyGames; hideIgnoredUserGames = _hideIgnoredUserGames; - invalidateFilter(); -} - -void GamesProxyModel::setHideFullGames(bool _showFullGames) -{ - hideFullGames = _showFullGames; - invalidateFilter(); -} - -void GamesProxyModel::setHideGamesThatStarted(bool _showGamesThatStarted) -{ - hideGamesThatStarted = _showGamesThatStarted; - invalidateFilter(); -} - -void GamesProxyModel::setHidePasswordProtectedGames(bool _showPasswordProtectedGames) -{ - hidePasswordProtectedGames = _showPasswordProtectedGames; - invalidateFilter(); -} - -void GamesProxyModel::setHideNotBuddyCreatedGames(bool value) -{ - hideNotBuddyCreatedGames = value; - invalidateFilter(); -} - -void GamesProxyModel::setHideOpenDecklistGames(bool _hideOpenDecklistGames) -{ + hideFullGames = _hideFullGames; + hideGamesThatStarted = _hideGamesThatStarted; + hidePasswordProtectedGames = _hidePasswordProtectedGames; + hideNotBuddyCreatedGames = _hideNotBuddyCreatedGames; hideOpenDecklistGames = _hideOpenDecklistGames; - invalidateFilter(); -} - -void GamesProxyModel::setGameNameFilter(const QString &_gameNameFilter) -{ gameNameFilter = _gameNameFilter; - invalidateFilter(); -} - -void GamesProxyModel::setCreatorNameFilter(const QString &_creatorNameFilter) -{ creatorNameFilter = _creatorNameFilter; - invalidateFilter(); -} - -void GamesProxyModel::setGameTypeFilter(const QSet &_gameTypeFilter) -{ gameTypeFilter = _gameTypeFilter; - invalidateFilter(); -} - -void GamesProxyModel::setMaxPlayersFilter(int _maxPlayersFilterMin, int _maxPlayersFilterMax) -{ maxPlayersFilterMin = _maxPlayersFilterMin; maxPlayersFilterMax = _maxPlayersFilterMax; - invalidateFilter(); -} - -void GamesProxyModel::setMaxGameAge(const QTime &_maxGameAge) -{ maxGameAge = _maxGameAge; - invalidateFilter(); -} - -void GamesProxyModel::setShowOnlyIfSpectatorsCanWatch(bool _showOnlyIfSpectatorsCanWatch) -{ showOnlyIfSpectatorsCanWatch = _showOnlyIfSpectatorsCanWatch; - invalidateFilter(); -} - -void GamesProxyModel::setShowSpectatorPasswordProtected(bool _showSpectatorPasswordProtected) -{ showSpectatorPasswordProtected = _showSpectatorPasswordProtected; - invalidateFilter(); -} - -void GamesProxyModel::setShowOnlyIfSpectatorsCanChat(bool _showOnlyIfSpectatorsCanChat) -{ showOnlyIfSpectatorsCanChat = _showOnlyIfSpectatorsCanChat; - invalidateFilter(); -} - -void GamesProxyModel::setShowOnlyIfSpectatorsCanSeeHands(bool _showOnlyIfSpectatorsCanSeeHands) -{ showOnlyIfSpectatorsCanSeeHands = _showOnlyIfSpectatorsCanSeeHands; +#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } int GamesProxyModel::getNumFilteredGames() const @@ -400,25 +348,8 @@ int GamesProxyModel::getNumFilteredGames() const void GamesProxyModel::resetFilterParameters() { - hideFullGames = false; - hideGamesThatStarted = false; - hidePasswordProtectedGames = false; - hideBuddiesOnlyGames = false; - hideIgnoredUserGames = false; - hideNotBuddyCreatedGames = false; - hideOpenDecklistGames = false; - gameNameFilter = QString(); - creatorNameFilter = QString(); - gameTypeFilter.clear(); - maxPlayersFilterMin = DEFAULT_MAX_PLAYERS_MIN; - maxPlayersFilterMax = DEFAULT_MAX_PLAYERS_MAX; - maxGameAge = DEFAULT_MAX_GAME_AGE; - showOnlyIfSpectatorsCanWatch = false; - showSpectatorPasswordProtected = false; - showOnlyIfSpectatorsCanChat = false; - showOnlyIfSpectatorsCanSeeHands = false; - - invalidateFilter(); + setGameFilters(false, false, false, false, false, false, false, QString(), QString(), {}, DEFAULT_MAX_PLAYERS_MIN, + DEFAULT_MAX_PLAYERS_MAX, DEFAULT_MAX_GAME_AGE, false, false, false, false); } bool GamesProxyModel::areFilterParametersSetToDefaults() const @@ -434,32 +365,24 @@ bool GamesProxyModel::areFilterParametersSetToDefaults() const void GamesProxyModel::loadFilterParameters(const QMap &allGameTypes) { GameFiltersSettings &gameFilters = SettingsCache::instance().gameFilters(); - hideFullGames = gameFilters.isHideFullGames(); - hideGamesThatStarted = gameFilters.isHideGamesThatStarted(); - hidePasswordProtectedGames = gameFilters.isHidePasswordProtectedGames(); - hideIgnoredUserGames = gameFilters.isHideIgnoredUserGames(); - hideBuddiesOnlyGames = gameFilters.isHideBuddiesOnlyGames(); - hideNotBuddyCreatedGames = gameFilters.isHideNotBuddyCreatedGames(); - hideOpenDecklistGames = gameFilters.isHideOpenDecklistGames(); - gameNameFilter = gameFilters.getGameNameFilter(); - creatorNameFilter = gameFilters.getCreatorNameFilter(); - maxPlayersFilterMin = gameFilters.getMinPlayers(); - maxPlayersFilterMax = gameFilters.getMaxPlayers(); - maxGameAge = gameFilters.getMaxGameAge(); - showOnlyIfSpectatorsCanWatch = gameFilters.isShowOnlyIfSpectatorsCanWatch(); - showSpectatorPasswordProtected = gameFilters.isShowSpectatorPasswordProtected(); - showOnlyIfSpectatorsCanChat = gameFilters.isShowOnlyIfSpectatorsCanChat(); - showOnlyIfSpectatorsCanSeeHands = gameFilters.isShowOnlyIfSpectatorsCanSeeHands(); + QSet newGameTypeFilter; QMapIterator gameTypesIterator(allGameTypes); while (gameTypesIterator.hasNext()) { gameTypesIterator.next(); if (gameFilters.isGameTypeEnabled(gameTypesIterator.value())) { - gameTypeFilter.insert(gameTypesIterator.key()); + newGameTypeFilter.insert(gameTypesIterator.key()); } } - invalidateFilter(); + setGameFilters(gameFilters.isHideBuddiesOnlyGames(), gameFilters.isHideIgnoredUserGames(), + gameFilters.isHideFullGames(), gameFilters.isHideGamesThatStarted(), + gameFilters.isHidePasswordProtectedGames(), gameFilters.isHideNotBuddyCreatedGames(), + gameFilters.isHideOpenDecklistGames(), gameFilters.getGameNameFilter(), + gameFilters.getCreatorNameFilter(), newGameTypeFilter, gameFilters.getMinPlayers(), + gameFilters.getMaxPlayers(), gameFilters.getMaxGameAge(), + gameFilters.isShowOnlyIfSpectatorsCanWatch(), gameFilters.isShowSpectatorPasswordProtected(), + gameFilters.isShowOnlyIfSpectatorsCanChat(), gameFilters.isShowOnlyIfSpectatorsCanSeeHands()); } void GamesProxyModel::saveFilterParameters(const QMap &allGameTypes) @@ -577,5 +500,9 @@ bool GamesProxyModel::filterAcceptsRow(int sourceRow) const void GamesProxyModel::refresh() { +#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } diff --git a/cockatrice/src/interface/widgets/server/games_model.h b/cockatrice/src/interface/widgets/server/games_model.h index 1541b57bf..d29800f66 100644 --- a/cockatrice/src/interface/widgets/server/games_model.h +++ b/cockatrice/src/interface/widgets/server/games_model.h @@ -102,52 +102,42 @@ public: { return hideBuddiesOnlyGames; } - void setHideBuddiesOnlyGames(bool _showBuddiesOnlyGames); bool getHideIgnoredUserGames() const { return hideIgnoredUserGames; } - void setHideIgnoredUserGames(bool _hideIgnoredUserGames); bool getHideFullGames() const { return hideFullGames; } - void setHideFullGames(bool _showFullGames); bool getHideGamesThatStarted() const { return hideGamesThatStarted; } - void setHideGamesThatStarted(bool _showGamesThatStarted); bool getHidePasswordProtectedGames() const { return hidePasswordProtectedGames; } - void setHidePasswordProtectedGames(bool _showPasswordProtectedGames); bool getHideNotBuddyCreatedGames() const { return hideNotBuddyCreatedGames; } - void setHideNotBuddyCreatedGames(bool value); bool getHideOpenDecklistGames() const { return hideOpenDecklistGames; } - void setHideOpenDecklistGames(bool _hideOpenDecklistGames); QString getGameNameFilter() const { return gameNameFilter; } - void setGameNameFilter(const QString &_gameNameFilter); QString getCreatorNameFilter() const { return creatorNameFilter; } - void setCreatorNameFilter(const QString &_creatorNameFilter); QSet getGameTypeFilter() const { return gameTypeFilter; } - void setGameTypeFilter(const QSet &_gameTypeFilter); int getMaxPlayersFilterMin() const { return maxPlayersFilterMin; @@ -156,32 +146,43 @@ public: { return maxPlayersFilterMax; } - void setMaxPlayersFilter(int _maxPlayersFilterMin, int _maxPlayersFilterMax); const QTime &getMaxGameAge() const { return maxGameAge; } - void setMaxGameAge(const QTime &_maxGameAge); bool getShowOnlyIfSpectatorsCanWatch() const { return showOnlyIfSpectatorsCanWatch; } - void setShowOnlyIfSpectatorsCanWatch(bool _showOnlyIfSpectatorsCanWatch); bool getShowSpectatorPasswordProtected() const { return showSpectatorPasswordProtected; } - void setShowSpectatorPasswordProtected(bool _showSpectatorPasswordProtected); bool getShowOnlyIfSpectatorsCanChat() const { return showOnlyIfSpectatorsCanChat; } - void setShowOnlyIfSpectatorsCanChat(bool _showOnlyIfSpectatorsCanChat); bool getShowOnlyIfSpectatorsCanSeeHands() const { return showOnlyIfSpectatorsCanSeeHands; } - void setShowOnlyIfSpectatorsCanSeeHands(bool _showOnlyIfSpectatorsCanSeeHands); + void setGameFilters(bool _hideBuddiesOnlyGames, + bool _hideIgnoredUserGames, + bool _hideFullGames, + bool _hideGamesThatStarted, + bool _hidePasswordProtectedGames, + bool _hideNotBuddyCreatedGames, + bool _hideOpenDecklistGames, + const QString &_gameNameFilter, + const QString &_creatorNameFilter, + const QSet &_gameTypeFilter, + int _maxPlayersFilterMin, + int _maxPlayersFilterMax, + const QTime &_maxGameAge, + bool _showOnlyIfSpectatorsCanWatch, + bool _showSpectatorPasswordProtected, + bool _showOnlyIfSpectatorsCanChat, + bool _showOnlyIfSpectatorsCanSeeHands); int getNumFilteredGames() const; void resetFilterParameters(); diff --git a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp index 836d900b6..e90926768 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_replays.cpp +++ b/cockatrice/src/interface/widgets/tabs/tab_replays.cpp @@ -440,7 +440,10 @@ void TabReplays::downloadFinished(const Response &r, const std::string &_data = resp.replay_data(); QFile f(filePath); - f.open(QIODevice::WriteOnly); + if (!f.open(QIODevice::WriteOnly)) { + qWarning() << "failed to open" << filePath << "for writing after downloading replay"; + return; + } f.write((const char *)_data.data(), _data.size()); f.close(); } diff --git a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp index 0c9557418..b1300e2a2 100644 --- a/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp +++ b/libcockatrice_card/libcockatrice/card/database/card_database_loader.cpp @@ -36,8 +36,7 @@ CardDatabaseLoader::~CardDatabaseLoader() LoadStatus CardDatabaseLoader::loadFromFile(const QString &fileName) { QFile file(fileName); - file.open(QIODevice::ReadOnly); - if (!file.isOpen()) { + if (!file.open(QIODevice::ReadOnly)) { return FileError; } @@ -150,4 +149,4 @@ bool CardDatabaseLoader::saveCustomTokensToFile() availableParsers.first()->saveToFile(tmpSets, tmpCards, fileName); return true; -} \ No newline at end of file +} diff --git a/libcockatrice_card/libcockatrice/card/database/model/card_database_display_model.cpp b/libcockatrice_card/libcockatrice/card/database/model/card_database_display_model.cpp index fc1b20cf6..5ce63a939 100644 --- a/libcockatrice_card/libcockatrice/card/database/model/card_database_display_model.cpp +++ b/libcockatrice_card/libcockatrice/card/database/model/card_database_display_model.cpp @@ -184,13 +184,20 @@ bool CardDatabaseDisplayModel::rowMatchesCardName(CardInfoPtr info) const void CardDatabaseDisplayModel::clearFilterAll() { +#if (QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)) + beginFilterChange(); +#endif cardName.clear(); cardText.clear(); cardTypes.clear(); cardColors.clear(); if (filterTree != nullptr) filterTree->clear(); +#if (QT_VERSION >= QT_VERSION_CHECK(6, 10, 0)) + endFilterChange(QSortFilterProxyModel::Direction::Rows); +#else invalidateFilter(); +#endif } void CardDatabaseDisplayModel::setFilterTree(FilterTree *_filterTree) @@ -217,4 +224,4 @@ const QString CardDatabaseDisplayModel::sanitizeCardName(const QString &dirtyNam } } return QString::fromStdWString(toReturn); -} \ No newline at end of file +} diff --git a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h index 2a2c09c84..ef2d802fd 100644 --- a/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h +++ b/libcockatrice_settings/libcockatrice/settings/game_filters_settings.h @@ -22,7 +22,6 @@ public: bool isHidePasswordProtectedGames(); bool isHideIgnoredUserGames(); bool isHideNotBuddyCreatedGames(); - void setHideOpenDecklistGames(bool hide); bool isHideOpenDecklistGames(); QString getGameNameFilter(); QString getCreatorNameFilter(); @@ -37,6 +36,7 @@ public: void setHideBuddiesOnlyGames(bool hide); void setHideIgnoredUserGames(bool hide); + void setHideOpenDecklistGames(bool hide); void setHideFullGames(bool hide); void setHideGamesThatStarted(bool hide); void setHidePasswordProtectedGames(bool hide); @@ -52,9 +52,6 @@ public: void setShowSpectatorPasswordProtected(bool show); void setShowOnlyIfSpectatorsCanChat(bool show); void setShowOnlyIfSpectatorsCanSeeHands(bool show); -signals: - -public slots: private: explicit GameFiltersSettings(const QString &settingPath, QObject *parent = nullptr); diff --git a/libcockatrice_utility/libcockatrice/utility/logger.cpp b/libcockatrice_utility/libcockatrice/utility/logger.cpp index 0184146ae..37e07acec 100644 --- a/libcockatrice_utility/libcockatrice/utility/logger.cpp +++ b/libcockatrice_utility/libcockatrice/utility/logger.cpp @@ -4,6 +4,7 @@ #include #include +#include #include #include #include @@ -51,7 +52,10 @@ void Logger::openLogfileSession() } fileHandle.setFileName(LOGGER_FILENAME); - fileHandle.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text); + if (!fileHandle.open(QIODevice::WriteOnly | QIODevice::Truncate | QIODevice::Text)) { + qWarning() << "Logger failed to open" << LOGGER_FILENAME << "for writing"; + return; + } fileStream.setDevice(&fileHandle); #if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0)) fileStream << "Log session started at " << QDateTime::currentDateTime().toString() << Qt::endl; From adff828415a10f8ab2c8ea181fbdd7032d63b233 Mon Sep 17 00:00:00 2001 From: BruebachL <44814898+BruebachL@users.noreply.github.com> Date: Wed, 5 Nov 2025 18:33:40 +0100 Subject: [PATCH 4/5] Move models to lib (#6274) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * 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 db5982ad1cd145345d58c6cc3cf989790646676c. Took 55 seconds * Lint an include Took 17 minutes Took 9 seconds --------- Co-authored-by: Lukas Brübach --- CMakeLists.txt | 1 + cockatrice/CMakeLists.txt | 11 ++++- .../parsers/interface_json_deck_parser.h | 2 +- .../src/game/deckview/deck_view_container.cpp | 2 +- .../src/game/deckview/deck_view_container.h | 2 +- .../src/game/dialogs/dlg_create_token.cpp | 4 +- cockatrice/src/game/player/player_info.h | 2 +- .../card_group_display_widget.cpp | 4 +- .../card_group_display_widget.h | 2 +- .../flat_card_group_display_widget.cpp | 2 +- .../overlapped_card_group_display_widget.cpp | 2 +- .../cards/deck_card_zone_display_widget.cpp | 2 +- .../cards/deck_card_zone_display_widget.h | 2 +- .../deck_analytics/deck_analytics_widget.h | 2 +- .../deck_analytics/mana_base_widget.cpp | 2 +- .../widgets/deck_analytics/mana_base_widget.h | 2 +- .../deck_analytics/mana_curve_widget.cpp | 2 +- .../deck_analytics/mana_curve_widget.h | 2 +- .../deck_analytics/mana_devotion_widget.cpp | 2 +- .../deck_analytics/mana_devotion_widget.h | 2 +- .../deck_editor_database_display_widget.h | 4 +- .../deck_editor_filter_dock_widget.cpp | 2 +- .../widgets/dialogs/dlg_edit_tokens.cpp | 4 +- .../widgets/dialogs/dlg_load_deck.cpp | 2 +- .../dialogs/dlg_load_deck_from_clipboard.cpp | 2 +- .../widgets/dialogs/dlg_manage_sets.cpp | 2 +- .../dialogs/dlg_select_set_for_cards.cpp | 2 +- .../dialogs/dlg_select_set_for_cards.h | 2 +- .../layout_containers/overlap_widget.cpp | 2 +- .../all_zones_card_amount_widget.h | 4 +- .../printing_selector/card_amount_widget.h | 4 +- .../printing_selector/printing_selector.h | 2 +- .../printing_selector_card_display_widget.h | 2 +- .../printing_selector_card_overlay_widget.h | 2 +- .../widgets/tabs/abstract_tab_deck_editor.cpp | 2 +- .../average_deck/edhrec_deck_api_response.cpp | 2 +- .../average_deck/edhrec_deck_api_response.h | 2 +- .../tabs/api/edhrec/tab_edhrec_main.cpp | 4 +- .../widgets/tabs/tab_deck_editor.cpp | 2 +- .../widgets/tabs/tab_deck_storage.cpp | 2 +- .../interface/widgets/tabs/tab_supervisor.h | 2 +- .../tab_deck_editor_visual.cpp | 4 +- .../tab_deck_storage_visual.cpp | 2 +- .../visual_database_display_widget.h | 4 +- .../visual_deck_editor_sample_hand_widget.cpp | 2 +- .../visual_deck_editor_sample_hand_widget.h | 2 +- .../visual_deck_editor_widget.cpp | 10 ++--- .../visual_deck_editor_widget.h | 8 ++-- .../deck_preview_deck_tags_display_widget.h | 2 +- .../deck_preview/deck_preview_widget.h | 2 +- .../visual_deck_storage_widget.h | 2 +- libcockatrice_card/CMakeLists.txt | 14 ------- libcockatrice_deck_list/CMakeLists.txt | 24 +++-------- libcockatrice_models/CMakeLists.txt | 41 +++++++++++++++++++ .../card/card_completer_proxy_model.cpp | 0 .../card/card_completer_proxy_model.h | 0 .../database}/card/card_search_model.cpp | 0 .../models/database}/card/card_search_model.h | 0 .../database}/card_database_display_model.cpp | 0 .../database}/card_database_display_model.h | 0 .../models/database}/card_database_model.cpp | 3 +- .../models/database}/card_database_model.h | 3 +- .../database}/card_set/card_sets_model.cpp | 0 .../database}/card_set/card_sets_model.h | 0 .../database}/token/token_display_model.cpp | 0 .../database}/token/token_display_model.h | 0 .../database}/token/token_edit_model.cpp | 5 ++- .../models/database}/token/token_edit_model.h | 0 .../models}/deck_list/deck_list_model.cpp | 0 .../models}/deck_list/deck_list_model.h | 0 .../deck_list_sort_filter_proxy_model.cpp | 0 .../deck_list_sort_filter_proxy_model.h | 0 .../models}/deck_list/deck_loader.cpp | 0 .../models}/deck_list/deck_loader.h | 0 74 files changed, 127 insertions(+), 105 deletions(-) create mode 100644 libcockatrice_models/CMakeLists.txt rename {libcockatrice_card/libcockatrice/card/database/model => libcockatrice_models/libcockatrice/models/database}/card/card_completer_proxy_model.cpp (100%) rename {libcockatrice_card/libcockatrice/card/database/model => libcockatrice_models/libcockatrice/models/database}/card/card_completer_proxy_model.h (100%) rename {libcockatrice_card/libcockatrice/card/database/model => libcockatrice_models/libcockatrice/models/database}/card/card_search_model.cpp (100%) rename {libcockatrice_card/libcockatrice/card/database/model => libcockatrice_models/libcockatrice/models/database}/card/card_search_model.h (100%) rename {libcockatrice_card/libcockatrice/card/database/model => libcockatrice_models/libcockatrice/models/database}/card_database_display_model.cpp (100%) rename {libcockatrice_card/libcockatrice/card/database/model => libcockatrice_models/libcockatrice/models/database}/card_database_display_model.h (100%) rename {libcockatrice_card/libcockatrice/card/database/model => libcockatrice_models/libcockatrice/models/database}/card_database_model.cpp (98%) rename {libcockatrice_card/libcockatrice/card/database/model => libcockatrice_models/libcockatrice/models/database}/card_database_model.h (96%) rename {libcockatrice_card/libcockatrice/card/database/model => libcockatrice_models/libcockatrice/models/database}/card_set/card_sets_model.cpp (100%) rename {libcockatrice_card/libcockatrice/card/database/model => libcockatrice_models/libcockatrice/models/database}/card_set/card_sets_model.h (100%) rename {libcockatrice_card/libcockatrice/card/database/model => libcockatrice_models/libcockatrice/models/database}/token/token_display_model.cpp (100%) rename {libcockatrice_card/libcockatrice/card/database/model => libcockatrice_models/libcockatrice/models/database}/token/token_display_model.h (100%) rename {libcockatrice_card/libcockatrice/card/database/model => libcockatrice_models/libcockatrice/models/database}/token/token_edit_model.cpp (89%) rename {libcockatrice_card/libcockatrice/card/database/model => libcockatrice_models/libcockatrice/models/database}/token/token_edit_model.h (100%) rename {libcockatrice_deck_list/libcockatrice => libcockatrice_models/libcockatrice/models}/deck_list/deck_list_model.cpp (100%) rename {libcockatrice_deck_list/libcockatrice => libcockatrice_models/libcockatrice/models}/deck_list/deck_list_model.h (100%) rename {libcockatrice_deck_list/libcockatrice => libcockatrice_models/libcockatrice/models}/deck_list/deck_list_sort_filter_proxy_model.cpp (100%) rename {libcockatrice_deck_list/libcockatrice => libcockatrice_models/libcockatrice/models}/deck_list/deck_list_sort_filter_proxy_model.h (100%) rename {libcockatrice_deck_list/libcockatrice => libcockatrice_models/libcockatrice/models}/deck_list/deck_loader.cpp (100%) rename {libcockatrice_deck_list/libcockatrice => libcockatrice_models/libcockatrice/models}/deck_list/deck_loader.h (100%) 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 From f24c36d6b16c1ca7f57c25e20c021481d5a1cb1a Mon Sep 17 00:00:00 2001 From: BruebachL <44814898+BruebachL@users.noreply.github.com> Date: Wed, 5 Nov 2025 18:51:08 +0100 Subject: [PATCH 5/5] Core qt module for libs (#6278) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * Move logger and key signals from libcockatrice_utility to Cockatrice. Took 9 minutes * Only link Qt::Core instead of COCKATRICE_QT_MODULES to libraries, if possible. Took 2 minutes --------- Co-authored-by: Lukas Brübach --- cmake/FindQtRuntime.cmake | 3 +++ cockatrice/CMakeLists.txt | 2 ++ .../src/interface}/key_signals.cpp | 0 .../src/interface}/key_signals.h | 0 .../src/interface}/logger.cpp | 0 .../src/interface}/logger.h | 0 .../deck_editor_database_display_widget.h | 2 +- .../deck_editor/deck_editor_deck_dock_widget.h | 2 +- .../deck_editor_filter_dock_widget.h | 2 +- .../interface/widgets/dialogs/dlg_view_log.cpp | 3 ++- .../interface/widgets/tabs/tab_deck_editor.h | 2 +- .../visual_database_display_widget.h | 2 +- cockatrice/src/interface/window_main.cpp | 2 +- cockatrice/src/main.cpp | 2 +- libcockatrice_card/CMakeLists.txt | 2 +- libcockatrice_deck_list/CMakeLists.txt | 4 +--- libcockatrice_protocol/CMakeLists.txt | 4 +--- libcockatrice_rng/CMakeLists.txt | 2 +- libcockatrice_utility/CMakeLists.txt | 17 +++++------------ 19 files changed, 23 insertions(+), 28 deletions(-) rename {libcockatrice_utility/libcockatrice/utility => cockatrice/src/interface}/key_signals.cpp (100%) rename {libcockatrice_utility/libcockatrice/utility => cockatrice/src/interface}/key_signals.h (100%) rename {libcockatrice_utility/libcockatrice/utility => cockatrice/src/interface}/logger.cpp (100%) rename {libcockatrice_utility/libcockatrice/utility => cockatrice/src/interface}/logger.h (100%) diff --git a/cmake/FindQtRuntime.cmake b/cmake/FindQtRuntime.cmake index 3025934f4..769f9b463 100644 --- a/cmake/FindQtRuntime.cmake +++ b/cmake/FindQtRuntime.cmake @@ -115,4 +115,7 @@ string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" ORACLE_QT_MO string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" DB_CONVERTER_QT_MODULES "${_DBCONVERTER_NEEDED}") string(REGEX REPLACE "([^;]+)" "${COCKATRICE_QT_VERSION_NAME}::\\1" TEST_QT_MODULES "${_TEST_NEEDED}") +# Core-only export (useful for headless libs) +set(QT_CORE_MODULE "${COCKATRICE_QT_VERSION_NAME}::Core") + message(STATUS "Found Qt ${${COCKATRICE_QT_VERSION_NAME}_VERSION} at: ${${COCKATRICE_QT_VERSION_NAME}_DIR}") diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 3308b2733..9eed16ff7 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -258,6 +258,8 @@ set(cockatrice_SOURCES src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual.cpp src/interface/widgets/tabs/visual_deck_editor/tab_deck_editor_visual_tab_widget.cpp src/interface/widgets/tabs/visual_deck_storage/tab_deck_storage_visual.cpp + src/interface/key_signals.cpp + src/interface/logger.cpp ) add_subdirectory(sounds) diff --git a/libcockatrice_utility/libcockatrice/utility/key_signals.cpp b/cockatrice/src/interface/key_signals.cpp similarity index 100% rename from libcockatrice_utility/libcockatrice/utility/key_signals.cpp rename to cockatrice/src/interface/key_signals.cpp diff --git a/libcockatrice_utility/libcockatrice/utility/key_signals.h b/cockatrice/src/interface/key_signals.h similarity index 100% rename from libcockatrice_utility/libcockatrice/utility/key_signals.h rename to cockatrice/src/interface/key_signals.h diff --git a/libcockatrice_utility/libcockatrice/utility/logger.cpp b/cockatrice/src/interface/logger.cpp similarity index 100% rename from libcockatrice_utility/libcockatrice/utility/logger.cpp rename to cockatrice/src/interface/logger.cpp diff --git a/libcockatrice_utility/libcockatrice/utility/logger.h b/cockatrice/src/interface/logger.h similarity index 100% rename from libcockatrice_utility/libcockatrice/utility/logger.h rename to cockatrice/src/interface/logger.h 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 07f79dc55..0add31322 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 @@ -9,13 +9,13 @@ #define DECK_EDITOR_DATABASE_DISPLAY_WIDGET_H #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" +#include "../../key_signals.h" #include "../utility/custom_line_edit.h" #include #include #include #include -#include class AbstractTabDeckEditor; class DeckEditorDatabaseDisplayWidget : public QWidget diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h index 06169aa3e..c6c3181b8 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h @@ -9,6 +9,7 @@ #define DECK_EDITOR_DECK_DOCK_WIDGET_H #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" +#include "../../key_signals.h" #include "../utility/custom_line_edit.h" #include "../visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" @@ -18,7 +19,6 @@ #include #include #include -#include class DeckListModel; class AbstractTabDeckEditor; diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h index 298f6c4e5..de135460f 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_filter_dock_widget.h @@ -9,10 +9,10 @@ #define DECK_EDITOR_FILTER_DOCK_WIDGET_H #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" +#include "../../key_signals.h" #include #include -#include class FilterTreeModel; class AbstractTabDeckEditor; diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp index 7ad8ec9ab..0fb98bef9 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_view_log.cpp @@ -1,12 +1,13 @@ #include "dlg_view_log.h" +#include "../../logger.h" + #include #include #include #include #include #include -#include DlgViewLog::DlgViewLog(QWidget *parent) : QDialog(parent) { diff --git a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h index ec953055c..b80ce8f75 100644 --- a/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h +++ b/cockatrice/src/interface/widgets/tabs/tab_deck_editor.h @@ -1,11 +1,11 @@ #ifndef WINDOW_DECKEDITOR_H #define WINDOW_DECKEDITOR_H +#include "../../key_signals.h" #include "../interface/widgets/visual_deck_storage/deck_preview/deck_preview_deck_tags_display_widget.h" #include "abstract_tab_deck_editor.h" #include -#include class CardDatabaseModel; class CardDatabaseDisplayModel; 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 898f5ccff..c05c755f1 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 @@ -9,6 +9,7 @@ #include "../../../filters/filter_tree_model.h" #include "../../../interface/widgets/tabs/abstract_tab_deck_editor.h" +#include "../../key_signals.h" #include "../../layouts/flow_layout.h" #include "../cards/card_info_picture_with_text_overlay_widget.h" #include "../cards/card_size_widget.h" @@ -30,7 +31,6 @@ #include #include #include -#include #include inline Q_LOGGING_CATEGORY(VisualDatabaseDisplayLog, "visual_database_display"); diff --git a/cockatrice/src/interface/window_main.cpp b/cockatrice/src/interface/window_main.cpp index de6c90a98..4186f7ce7 100644 --- a/cockatrice/src/interface/window_main.cpp +++ b/cockatrice/src/interface/window_main.cpp @@ -36,6 +36,7 @@ #include "../interface/widgets/tabs/tab_game.h" #include "../interface/widgets/tabs/tab_supervisor.h" #include "../main.h" +#include "logger.h" #include "version_string.h" #include "widgets/utility/get_text_with_max.h" @@ -71,7 +72,6 @@ #include #include #include -#include #define GITHUB_PAGES_URL "https://cockatrice.github.io" #define GITHUB_CONTRIBUTORS_URL "https://github.com/Cockatrice/Cockatrice/graphs/contributors?type=c" diff --git a/cockatrice/src/main.cpp b/cockatrice/src/main.cpp index 2c79297ef..ecb915cee 100644 --- a/cockatrice/src/main.cpp +++ b/cockatrice/src/main.cpp @@ -23,6 +23,7 @@ #include "QtNetwork/QNetworkInterface" #include "client/network/update/card_spoiler/spoiler_background_updater.h" #include "client/sound_engine.h" +#include "interface/logger.h" #include "interface/pixel_map_generator.h" #include "interface/theme_manager.h" #include "interface/widgets/dialogs/dlg_settings.h" @@ -44,7 +45,6 @@ #include #include #include -#include QTranslator *translator, *qtTranslator; RNG_Abstract *rng; diff --git a/libcockatrice_card/CMakeLists.txt b/libcockatrice_card/CMakeLists.txt index 0d48bf535..7217f7bff 100644 --- a/libcockatrice_card/CMakeLists.txt +++ b/libcockatrice_card/CMakeLists.txt @@ -52,5 +52,5 @@ target_include_directories( target_link_libraries( libcockatrice_card PUBLIC libcockatrice_settings - PUBLIC ${COCKATRICE_QT_MODULES} + PUBLIC ${QT_CORE_MODULE} ) diff --git a/libcockatrice_deck_list/CMakeLists.txt b/libcockatrice_deck_list/CMakeLists.txt index 0523343f6..1e0511c01 100644 --- a/libcockatrice_deck_list/CMakeLists.txt +++ b/libcockatrice_deck_list/CMakeLists.txt @@ -25,6 +25,4 @@ 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_utility ${COCKATRICE_QT_MODULES} -) +target_link_libraries(libcockatrice_deck_list PUBLIC libcockatrice_protocol libcockatrice_utility ${QT_CORE_MODULE}) diff --git a/libcockatrice_protocol/CMakeLists.txt b/libcockatrice_protocol/CMakeLists.txt index 64f1ee270..7dc0a0360 100644 --- a/libcockatrice_protocol/CMakeLists.txt +++ b/libcockatrice_protocol/CMakeLists.txt @@ -17,9 +17,7 @@ target_sources(libcockatrice_protocol PRIVATE ${SOURCES} ${HEADERS}) add_dependencies(libcockatrice_protocol libcockatrice_protocol_pb) # Link the actual generated protobuf library -target_link_libraries( - libcockatrice_protocol PUBLIC ${COCKATRICE_QT_MODULES} libcockatrice_protocol_pb libcockatrice_utility -) +target_link_libraries(libcockatrice_protocol PUBLIC ${QT_CORE_MODULE} libcockatrice_protocol_pb libcockatrice_utility) # Expose include paths target_include_directories( diff --git a/libcockatrice_rng/CMakeLists.txt b/libcockatrice_rng/CMakeLists.txt index 0e29e96f2..6ff2a4537 100644 --- a/libcockatrice_rng/CMakeLists.txt +++ b/libcockatrice_rng/CMakeLists.txt @@ -17,4 +17,4 @@ add_library( target_include_directories(libcockatrice_rng PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(libcockatrice_rng PUBLIC ${COCKATRICE_QT_MODULES}) +target_link_libraries(libcockatrice_rng PUBLIC ${QT_CORE_MODULE}) diff --git a/libcockatrice_utility/CMakeLists.txt b/libcockatrice_utility/CMakeLists.txt index f1e1d4a62..0575c260f 100644 --- a/libcockatrice_utility/CMakeLists.txt +++ b/libcockatrice_utility/CMakeLists.txt @@ -5,27 +5,20 @@ set(CMAKE_AUTOMOC ON) set(CMAKE_AUTOUIC ON) set(CMAKE_AUTORCC ON) -set(UTILITY_SOURCES - libcockatrice/utility/expression.cpp libcockatrice/utility/key_signals.cpp libcockatrice/utility/levenshtein.cpp - libcockatrice/utility/logger.cpp libcockatrice/utility/passwordhasher.cpp +set(UTILITY_SOURCES libcockatrice/utility/expression.cpp libcockatrice/utility/levenshtein.cpp + libcockatrice/utility/passwordhasher.cpp ) set(UTILITY_HEADERS - libcockatrice/utility/color.h - libcockatrice/utility/expression.h - libcockatrice/utility/key_signals.h - libcockatrice/utility/levenshtein.h - libcockatrice/utility/logger.h - libcockatrice/utility/macros.h - libcockatrice/utility/passwordhasher.h - libcockatrice/utility/trice_limits.h + libcockatrice/utility/color.h libcockatrice/utility/expression.h libcockatrice/utility/levenshtein.h + libcockatrice/utility/macros.h libcockatrice/utility/passwordhasher.h libcockatrice/utility/trice_limits.h ) add_library(libcockatrice_utility STATIC ${UTILITY_SOURCES} ${UTILITY_HEADERS}) target_include_directories(libcockatrice_utility PUBLIC ${CMAKE_CURRENT_SOURCE_DIR}) -target_link_libraries(libcockatrice_utility PUBLIC libcockatrice_rng ${COCKATRICE_QT_MODULES}) +target_link_libraries(libcockatrice_utility PUBLIC libcockatrice_rng ${QT_CORE_MODULE}) set(ORACLE_LIBS)