jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-11-11 04:23:29 -08:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

[CardDatabase] Store querier not as pointer

Browse source
This commit is contained in:
RickyRister 2026-03-26 09:59:38 -07:00 • committed by Lukas Brübach
parent 3931447729
commit 598da954fc
6 changed files with 10 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

5
libcockatrice_card/libcockatrice/card/database/card_database.cpp
View file

@ -27,7 +27,8 @@ CardDatabase::CardDatabase(QObject *parent,
ICardPreferenceProvider *prefs, ICardPreferenceProvider *prefs,
ICardDatabasePathProvider *pathProvider, ICardDatabasePathProvider *pathProvider,
ICardSetPriorityController *_setPriorityController) ICardSetPriorityController *_setPriorityController)
: QObject(parent), setPriorityController(_setPriorityController), loadStatus(NotLoaded) : QObject(parent), setPriorityController(_setPriorityController), loadStatus(NotLoaded),
querier(this, prefs)
{ {
qRegisterMetaType<CardInfoPtr>("CardInfoPtr"); qRegisterMetaType<CardInfoPtr>("CardInfoPtr");
qRegisterMetaType<CardInfoPtr>("CardSetPtr"); qRegisterMetaType<CardInfoPtr>("CardSetPtr");
@ -44,8 +45,6 @@ CardDatabase::CardDatabase(QObject *parent,
// that cross-thread loads are delivered via the event loop while same-thread/ // that cross-thread loads are delivered via the event loop while same-thread/
// synchronous callers get the swap immediately. // synchronous callers get the swap immediately.
connect(loader, &CardDatabaseLoader::databaseDataReady, this, &CardDatabase::swapInDatabaseData); connect(loader, &CardDatabaseLoader::databaseDataReady, this, &CardDatabase::swapInDatabaseData);
querier = new CardDatabaseQuerier(this, this, prefs);
} }
CardDatabase::~CardDatabase() CardDatabase::~CardDatabase()

5
libcockatrice_card/libcockatrice/card/database/card_database.h
View file

@ -60,9 +60,8 @@ protected:
LoadStatus loadStatus; LoadStatus loadStatus;
/** @brief Querier for higher-level card lookups. */ /** @brief Querier for higher-level card lookups. */
CardDatabaseQuerier *querier; CardDatabaseQuerier querier;
private:
/** /**
* @brief Refreshes the cached reverse-related cards for all cards. * @brief Refreshes the cached reverse-related cards for all cards.
*/ */
@ -143,7 +142,7 @@ public:
} }
/** @brief Returns the querier for performing card lookups. */ /** @brief Returns the querier for performing card lookups. */
[[nodiscard]] CardDatabaseQuerier *query() const [[nodiscard]] CardDatabaseQuerier const &query() const
{ {
return querier; return querier;
} }

2
libcockatrice_card/libcockatrice/card/database/card_database_manager.cpp
View file

@ -36,7 +36,7 @@ CardDatabase *CardDatabaseManager::getInstance()
return &instance; return &instance;
} }
CardDatabaseQuerier *CardDatabaseManager::query() CardDatabaseQuerier const &CardDatabaseManager::query()
{ {
return getInstance()->query(); return getInstance()->query();
} }

2
libcockatrice_card/libcockatrice/card/database/card_database_manager.h
View file

@ -63,7 +63,7 @@ public:
* @brief Returns the CardDatabaseQuerier of the singleton database. * @brief Returns the CardDatabaseQuerier of the singleton database.
* @return Pointer to CardDatabaseQuerier. * @return Pointer to CardDatabaseQuerier.
*/ */
static CardDatabaseQuerier *query(); static CardDatabaseQuerier const &query();
private: private:
/** @brief Private default constructor to enforce singleton. */ /** @brief Private default constructor to enforce singleton. */

6
libcockatrice_card/libcockatrice/card/database/card_database_querier.cpp
View file

@ -15,10 +15,8 @@
#include <iterator> #include <iterator>
#include <qnamespace.h> #include <qnamespace.h>
CardDatabaseQuerier::CardDatabaseQuerier(QObject *_parent, CardDatabaseQuerier::CardDatabaseQuerier(const CardDatabase *_db, const ICardPreferenceProvider *prefs)
const CardDatabase *_db, : db(_db), prefs(prefs)
const ICardPreferenceProvider *prefs)
: QObject(_parent), db(_db), prefs(prefs)
{ {
// Invalidate the cached count maps whenever the database contents change. // Invalidate the cached count maps whenever the database contents change.
connect(db, &CardDatabase::cardAdded, this, &CardDatabaseQuerier::invalidateCaches); connect(db, &CardDatabase::cardAdded, this, &CardDatabaseQuerier::invalidateCaches);

6
libcockatrice_card/libcockatrice/card/database/card_database_querier.h
View file

@ -25,19 +25,17 @@ struct CardRef;
* (e.g., CardInfoPtr, ExactCard, and PrintingInfo) from a CardDatabase. It also applies user * (e.g., CardInfoPtr, ExactCard, and PrintingInfo) from a CardDatabase. It also applies user
* printing preferences via ICardPreferenceProvider when determining preferred printings. * printing preferences via ICardPreferenceProvider when determining preferred printings.
*/ */
class CardDatabaseQuerier : public QObject class CardDatabaseQuerier
{ {
Q_OBJECT
public: public:
/** /**
* @brief Constructs a CardDatabaseQuerier. * @brief Constructs a CardDatabaseQuerier.
* *
* @param parent Parent QObject.
* @param db Pointer to the CardDatabase used for lookups. * @param db Pointer to the CardDatabase used for lookups.
* @param prefs Pointer to card preference provider which supplies user-preference for printings. * @param prefs Pointer to card preference provider which supplies user-preference for printings.
*/ */
explicit CardDatabaseQuerier(QObject *parent, const CardDatabase *db, const ICardPreferenceProvider *prefs); explicit CardDatabaseQuerier(const CardDatabase *db, const ICardPreferenceProvider *prefs);
/** /**
* @brief Retrieves a card by its exact name. * @brief Retrieves a card by its exact name.