From 78a09da5a5a9e1d245716b1cc44e74de855663b8 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Fri, 26 Sep 2025 20:01:24 +0200 Subject: [PATCH] Rename to querier and promote to QObject Took 39 minutes --- cockatrice/CMakeLists.txt | 2 +- cockatrice/src/database/card_database.cpp | 2 +- cockatrice/src/database/card_database.h | 10 ++--- .../src/database/card_database_manager.cpp | 2 +- .../src/database/card_database_manager.h | 3 +- ..._queries.cpp => card_database_querier.cpp} | 44 +++++++++---------- ...base_queries.h => card_database_querier.h} | 14 +++--- dbconverter/CMakeLists.txt | 2 +- tests/carddatabase/CMakeLists.txt | 4 +- 9 files changed, 43 insertions(+), 40 deletions(-) rename cockatrice/src/database/{card_database_queries.cpp => card_database_querier.cpp} (86%) rename cockatrice/src/database/{card_database_queries.h => card_database_querier.h} (87%) diff --git a/cockatrice/CMakeLists.txt b/cockatrice/CMakeLists.txt index 0b92297af..5ab2a066a 100644 --- a/cockatrice/CMakeLists.txt +++ b/cockatrice/CMakeLists.txt @@ -24,7 +24,7 @@ set(cockatrice_SOURCES src/database/card_database.cpp src/database/card_database_loader.cpp src/database/card_database_manager.cpp - src/database/card_database_queries.cpp + src/database/card_database_querier.cpp src/database/model/card_database_model.cpp src/database/model/card_database_display_model.cpp src/database/model/card/card_completer_proxy_model.cpp diff --git a/cockatrice/src/database/card_database.cpp b/cockatrice/src/database/card_database.cpp index 05241989a..a26445005 100644 --- a/cockatrice/src/database/card_database.cpp +++ b/cockatrice/src/database/card_database.cpp @@ -28,7 +28,7 @@ CardDatabase::CardDatabase(QObject *parent) : QObject(parent), loadStatus(NotLoa connect(loader, &CardDatabaseLoader::newSetsFound, this, &CardDatabase::cardDatabaseNewSetsFound); connect(loader, &CardDatabaseLoader::allNewSetsEnabled, this, &CardDatabase::cardDatabaseAllNewSetsEnabled); - queries = new CardDatabaseQueries(this); + querier = new CardDatabaseQuerier(this, this); } CardDatabase::~CardDatabase() diff --git a/cockatrice/src/database/card_database.h b/cockatrice/src/database/card_database.h index 0244a1ffd..a6941ee5b 100644 --- a/cockatrice/src/database/card_database.h +++ b/cockatrice/src/database/card_database.h @@ -4,7 +4,7 @@ #include "../card/exact_card.h" #include "../common/card_ref.h" #include "card_database_loader.h" -#include "card_database_queries.h" +#include "card_database_querier.h" #include #include @@ -41,7 +41,7 @@ protected: LoadStatus loadStatus; - CardDatabaseQueries *queries; + CardDatabaseQuerier *querier; private: void checkUnknownSets(); @@ -67,9 +67,9 @@ public: { return loadStatus; } - CardDatabaseQueries *query() const + CardDatabaseQuerier *query() const { - return queries; + return querier; } void enableAllUnknownSets(); void markAllSetsAsKnown(); @@ -90,7 +90,7 @@ signals: void cardRemoved(CardInfoPtr card); friend class CardDatabaseLoader; - friend class CardDatabaseQueries; + friend class CardDatabaseQuerier; }; #endif diff --git a/cockatrice/src/database/card_database_manager.cpp b/cockatrice/src/database/card_database_manager.cpp index d86e1639d..4ffe0cc70 100644 --- a/cockatrice/src/database/card_database_manager.cpp +++ b/cockatrice/src/database/card_database_manager.cpp @@ -6,7 +6,7 @@ CardDatabase *CardDatabaseManager::getInstance() return &instance; } -CardDatabaseQueries *CardDatabaseManager::query() +CardDatabaseQuerier *CardDatabaseManager::query() { return getInstance()->query(); } \ No newline at end of file diff --git a/cockatrice/src/database/card_database_manager.h b/cockatrice/src/database/card_database_manager.h index 7201b89f9..c87e04888 100644 --- a/cockatrice/src/database/card_database_manager.h +++ b/cockatrice/src/database/card_database_manager.h @@ -1,4 +1,3 @@ - #ifndef CARD_DATABASE_ACCESSOR_H #define CARD_DATABASE_ACCESSOR_H @@ -14,7 +13,7 @@ public: // Static method to access the singleton instance static CardDatabase *getInstance(); - static CardDatabaseQueries *query(); + static CardDatabaseQuerier *query(); private: CardDatabaseManager() = default; // Private constructor diff --git a/cockatrice/src/database/card_database_queries.cpp b/cockatrice/src/database/card_database_querier.cpp similarity index 86% rename from cockatrice/src/database/card_database_queries.cpp rename to cockatrice/src/database/card_database_querier.cpp index 7c49f6f4b..68cc39c9d 100644 --- a/cockatrice/src/database/card_database_queries.cpp +++ b/cockatrice/src/database/card_database_querier.cpp @@ -1,11 +1,11 @@ -#include "card_database_queries.h" +#include "card_database_querier.h" #include "../utility/card_set_comparator.h" #include "card_database.h" #include -CardDatabaseQueries::CardDatabaseQueries(const CardDatabase *_db) : db(_db) +CardDatabaseQuerier::CardDatabaseQuerier(QObject *_parent, const CardDatabase *_db) : QObject(_parent), db(_db) { } @@ -15,7 +15,7 @@ CardDatabaseQueries::CardDatabaseQueries(const CardDatabase *_db) : db(_db) * @param cardName The card name to look up * @return A CardInfoPtr, or null if not corresponding CardInfo is found. */ -CardInfoPtr CardDatabaseQueries::getCardInfo(const QString &cardName) const +CardInfoPtr CardDatabaseQuerier::getCardInfo(const QString &cardName) const { return db->cards.value(cardName); } @@ -26,7 +26,7 @@ CardInfoPtr CardDatabaseQueries::getCardInfo(const QString &cardName) const * @param cardNames The card names to look up * @return A List of CardInfoPtr. Any failed lookups will be ignored and dropped from the resulting list */ -QList CardDatabaseQueries::getCardInfos(const QStringList &cardNames) const +QList CardDatabaseQuerier::getCardInfos(const QStringList &cardNames) const { QList cardInfos; for (const QString &cardName : cardNames) { @@ -38,12 +38,12 @@ QList CardDatabaseQueries::getCardInfos(const QStringList &cardName return cardInfos; } -CardInfoPtr CardDatabaseQueries::getCardBySimpleName(const QString &cardName) const +CardInfoPtr CardDatabaseQuerier::getCardBySimpleName(const QString &cardName) const { return db->simpleNameCards.value(CardInfo::simplifyName(cardName)); } -CardInfoPtr CardDatabaseQueries::lookupCardByName(const QString &name) const +CardInfoPtr CardDatabaseQuerier::lookupCardByName(const QString &name) const { if (auto info = getCardInfo(name)) return info; @@ -61,7 +61,7 @@ CardInfoPtr CardDatabaseQueries::lookupCardByName(const QString &name) const * that entry. If providerId is given but not found, the PrintingInfo will be empty for that entry. * @return A list of cards. Any failed lookups will be ignored and dropped from the resulting list. */ -QList CardDatabaseQueries::getCards(const QList &cardRefs) const +QList CardDatabaseQuerier::getCards(const QList &cardRefs) const { QList cards; for (const auto &cardRef : cardRefs) { @@ -81,7 +81,7 @@ QList CardDatabaseQueries::getCards(const QList &cardRefs) c * @param cardRef The card to look up. * @return A specific printing of a card, or empty if not found. */ -ExactCard CardDatabaseQueries::getCard(const CardRef &cardRef) const +ExactCard CardDatabaseQuerier::getCard(const CardRef &cardRef) const { auto info = getCardInfo(cardRef.name); if (info.isNull()) { @@ -103,7 +103,7 @@ ExactCard CardDatabaseQueries::getCard(const CardRef &cardRef) const * @param cardRef The card to look up. * @return A specific printing of a card, or empty if not found. */ -ExactCard CardDatabaseQueries::guessCard(const CardRef &cardRef) const +ExactCard CardDatabaseQuerier::guessCard(const CardRef &cardRef) const { auto card = lookupCardByName(cardRef.name); auto printing = @@ -112,7 +112,7 @@ ExactCard CardDatabaseQueries::guessCard(const CardRef &cardRef) const return ExactCard(card, printing); } -ExactCard CardDatabaseQueries::getRandomCard() const +ExactCard CardDatabaseQuerier::getRandomCard() const { if (db->cards.isEmpty()) return {}; @@ -125,7 +125,7 @@ ExactCard CardDatabaseQueries::getRandomCard() const return ExactCard{randomCard, getPreferredPrinting(randomCard)}; } -ExactCard CardDatabaseQueries::getCardFromSameSet(const QString &cardName, const PrintingInfo &otherPrinting) const +ExactCard CardDatabaseQuerier::getCardFromSameSet(const QString &cardName, const PrintingInfo &otherPrinting) const { // The source card does not have a printing defined, which means we can't get a card from the same set. if (otherPrinting == PrintingInfo()) { @@ -147,7 +147,7 @@ ExactCard CardDatabaseQueries::getCardFromSameSet(const QString &cardName, const * @param providerId The uuid to look for * @return The PrintingInfo, or a default-constructed PrintingInfo if not found. */ -PrintingInfo CardDatabaseQueries::findPrintingWithId(const CardInfoPtr &cardInfo, const QString &providerId) const +PrintingInfo CardDatabaseQuerier::findPrintingWithId(const CardInfoPtr &cardInfo, const QString &providerId) const { for (const auto &printings : cardInfo->getSets()) { for (const auto &printing : printings) { @@ -160,7 +160,7 @@ PrintingInfo CardDatabaseQueries::findPrintingWithId(const CardInfoPtr &cardInfo return PrintingInfo(); } -PrintingInfo CardDatabaseQueries::getSpecificPrinting(const CardRef &cardRef) const +PrintingInfo CardDatabaseQuerier::getSpecificPrinting(const CardRef &cardRef) const { CardInfoPtr cardInfo = getCardInfo(cardRef.name); if (!cardInfo) { @@ -170,7 +170,7 @@ PrintingInfo CardDatabaseQueries::getSpecificPrinting(const CardRef &cardRef) co return findPrintingWithId(cardInfo, cardRef.providerId); } -PrintingInfo CardDatabaseQueries::getSpecificPrinting(const QString &cardName, +PrintingInfo CardDatabaseQuerier::getSpecificPrinting(const QString &cardName, const QString &setShortName, const QString &collectorNumber) const { @@ -208,12 +208,12 @@ PrintingInfo CardDatabaseQueries::getSpecificPrinting(const QString &cardName, * @param cardInfo The cardInfo to find the preferred printing for * @return A specific printing of a card */ -ExactCard CardDatabaseQueries::getPreferredCard(const CardInfoPtr &cardInfo) const +ExactCard CardDatabaseQuerier::getPreferredCard(const CardInfoPtr &cardInfo) const { return ExactCard(cardInfo, getPreferredPrinting(cardInfo)); } -bool CardDatabaseQueries::isPreferredPrinting(const CardRef &cardRef) const +bool CardDatabaseQuerier::isPreferredPrinting(const CardRef &cardRef) const { if (cardRef.providerId.startsWith("card_")) { return cardRef.providerId == @@ -222,13 +222,13 @@ bool CardDatabaseQueries::isPreferredPrinting(const CardRef &cardRef) const return cardRef.providerId == getPreferredPrintingProviderId(cardRef.name); } -PrintingInfo CardDatabaseQueries::getPreferredPrinting(const QString &cardName) const +PrintingInfo CardDatabaseQuerier::getPreferredPrinting(const QString &cardName) const { CardInfoPtr cardInfo = getCardInfo(cardName); return getPreferredPrinting(cardInfo); } -PrintingInfo CardDatabaseQueries::getPreferredPrinting(const CardInfoPtr &cardInfo) const +PrintingInfo CardDatabaseQuerier::getPreferredPrinting(const CardInfoPtr &cardInfo) const { if (!cardInfo) { return PrintingInfo(nullptr); @@ -260,7 +260,7 @@ PrintingInfo CardDatabaseQueries::getPreferredPrinting(const CardInfoPtr &cardIn return PrintingInfo(nullptr); } -QString CardDatabaseQueries::getPreferredPrintingProviderId(const QString &cardName) const +QString CardDatabaseQuerier::getPreferredPrintingProviderId(const QString &cardName) const { PrintingInfo preferredPrinting = getPreferredPrinting(cardName); QString uuid = preferredPrinting.getUuid(); @@ -275,7 +275,7 @@ QString CardDatabaseQueries::getPreferredPrintingProviderId(const QString &cardN return defaultCardInfo->getName(); } -QStringList CardDatabaseQueries::getAllMainCardTypes() const +QStringList CardDatabaseQuerier::getAllMainCardTypes() const { QSet types; for (const auto &card : db->cards.values()) { @@ -284,7 +284,7 @@ QStringList CardDatabaseQueries::getAllMainCardTypes() const return types.values(); } -QMap CardDatabaseQueries::getAllMainCardTypesWithCount() const +QMap CardDatabaseQuerier::getAllMainCardTypesWithCount() const { QMap typeCounts; @@ -296,7 +296,7 @@ QMap CardDatabaseQueries::getAllMainCardTypesWithCount() const return typeCounts; } -QMap CardDatabaseQueries::getAllSubCardTypesWithCount() const +QMap CardDatabaseQuerier::getAllSubCardTypesWithCount() const { QMap typeCounts; diff --git a/cockatrice/src/database/card_database_queries.h b/cockatrice/src/database/card_database_querier.h similarity index 87% rename from cockatrice/src/database/card_database_queries.h rename to cockatrice/src/database/card_database_querier.h index 64f4e24a3..26c601333 100644 --- a/cockatrice/src/database/card_database_queries.h +++ b/cockatrice/src/database/card_database_querier.h @@ -1,14 +1,18 @@ -#ifndef COCKATRICE_CARD_DATABASE_QUERIES_H -#define COCKATRICE_CARD_DATABASE_QUERIES_H +#ifndef COCKATRICE_CARD_DATABASE_QUERIER_H +#define COCKATRICE_CARD_DATABASE_QUERIER_H #include "../card/exact_card.h" #include "../common/card_ref.h" +#include + class CardDatabase; -class CardDatabaseQueries +class CardDatabaseQuerier : public QObject { + Q_OBJECT + public: - explicit CardDatabaseQueries(const CardDatabase *db); + explicit CardDatabaseQuerier(QObject *parent, const CardDatabase *db); [[nodiscard]] CardInfoPtr getCardInfo(const QString &cardName) const; [[nodiscard]] QList getCardInfos(const QStringList &cardNames) const; @@ -47,4 +51,4 @@ private: CardInfoPtr lookupCardByName(const QString &name) const; }; -#endif // COCKATRICE_CARD_DATABASE_QUERIES_H +#endif // COCKATRICE_CARD_DATABASE_QUERIER_H diff --git a/dbconverter/CMakeLists.txt b/dbconverter/CMakeLists.txt index a991a8f80..bc03a5ad3 100644 --- a/dbconverter/CMakeLists.txt +++ b/dbconverter/CMakeLists.txt @@ -9,7 +9,7 @@ set(dbconverter_SOURCES ../cockatrice/src/card/exact_card.cpp ../cockatrice/src/database/card_database.cpp ../cockatrice/src/database/card_database_loader.cpp - ../cockatrice/src/database/card_database_queries.cpp + ../cockatrice/src/database/card_database_querier.cpp ../cockatrice/src/database/parser/card_database_parser.cpp ../cockatrice/src/database/parser/cockatrice_xml_3.cpp ../cockatrice/src/database/parser/cockatrice_xml_4.cpp diff --git a/tests/carddatabase/CMakeLists.txt b/tests/carddatabase/CMakeLists.txt index 10997cc9a..dc72f7bac 100644 --- a/tests/carddatabase/CMakeLists.txt +++ b/tests/carddatabase/CMakeLists.txt @@ -22,7 +22,7 @@ add_executable( ../../cockatrice/src/card/exact_card.cpp ../../cockatrice/src/database/card_database.cpp ../../cockatrice/src/database/card_database_loader.cpp - ../../cockatrice/src/database/card_database_queries.cpp + ../../cockatrice/src/database/card_database_querier.cpp ../../cockatrice/src/database/parser/card_database_parser.cpp ../../cockatrice/src/database/parser/cockatrice_xml_3.cpp ../../cockatrice/src/database/parser/cockatrice_xml_4.cpp @@ -38,7 +38,7 @@ add_executable( ../../cockatrice/src/card/exact_card.cpp ../../cockatrice/src/database/card_database.cpp ../../cockatrice/src/database/card_database_loader.cpp - ../../cockatrice/src/database/card_database_queries.cpp + ../../cockatrice/src/database/card_database_querier.cpp ../../cockatrice/src/database/card_database_manager.cpp ../../cockatrice/src/database/parser/card_database_parser.cpp ../../cockatrice/src/database/parser/cockatrice_xml_3.cpp