jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-14 14:32:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

Change to a QSharedPointer and also delete cpp's for interfaces since they are not QObjects.

Browse source 
Took 6 minutes
This commit is contained in:
Lukas Brübach 2025-09-28 19:20:24 +02:00
parent b288c0e5f6
commit 38e41148f3
9 changed files with 8 additions and 11 deletions
Download patch file Download diff file Expand all files Collapse all files

2
cockatrice/src/database/card_database.cpp
View file

@ -15,7 +15,7 @@
#include <algorithm> #include <algorithm>
#include <utility> #include <utility>
CardDatabase::CardDatabase(QObject *parent, std::shared_ptr<ICardPreferenceProvider> prefs) CardDatabase::CardDatabase(QObject *parent, QSharedPointer<ICardPreferenceProvider> prefs)
: QObject(parent), loadStatus(NotLoaded) : QObject(parent), loadStatus(NotLoaded)
{ {
qRegisterMetaType<CardInfoPtr>("CardInfoPtr"); qRegisterMetaType<CardInfoPtr>("CardInfoPtr");

2
cockatrice/src/database/card_database.h
View file

@ -52,7 +52,7 @@ private:
*removeCardMutex = new QBasicMutex(); *removeCardMutex = new QBasicMutex();
public: public:
explicit CardDatabase(QObject *parent = nullptr, std::shared_ptr<ICardPreferenceProvider> prefs = nullptr); explicit CardDatabase(QObject *parent = nullptr, QSharedPointer<ICardPreferenceProvider> prefs = nullptr);
~CardDatabase() override; ~CardDatabase() override;
void removeCard(CardInfoPtr card); void removeCard(CardInfoPtr card);

2
cockatrice/src/database/card_database_manager.cpp
View file

@ -3,7 +3,7 @@
CardDatabase *CardDatabaseManager::getInstance() CardDatabase *CardDatabaseManager::getInstance()
{ {
static CardDatabase instance( static CardDatabase instance(
nullptr, std::make_shared<SettingsCardPreferenceProvider>()); // Created only once, on first access nullptr, QSharedPointer<SettingsCardPreferenceProvider>::create()); // Created only once, on first access
return &instance; return &instance;
} }

4
cockatrice/src/database/card_database_querier.cpp
View file

@ -9,8 +9,8 @@
CardDatabaseQuerier::CardDatabaseQuerier(QObject *_parent, CardDatabaseQuerier::CardDatabaseQuerier(QObject *_parent,
const CardDatabase *_db, const CardDatabase *_db,
std::shared_ptr<ICardPreferenceProvider> prefs) const QSharedPointer<ICardPreferenceProvider> &prefs)
: QObject(_parent), db(_db), prefs(std::move(prefs)) : QObject(_parent), db(_db), prefs(prefs)
{ {
} }

4
cockatrice/src/database/card_database_querier.h
View file

@ -16,7 +16,7 @@ class CardDatabaseQuerier : public QObject
public: public:
explicit CardDatabaseQuerier(QObject *parent, explicit CardDatabaseQuerier(QObject *parent,
const CardDatabase *db, const CardDatabase *db,
std::shared_ptr<ICardPreferenceProvider> prefs); const QSharedPointer<ICardPreferenceProvider> &prefs);
[[nodiscard]] CardInfoPtr getCardInfo(const QString &cardName) const; [[nodiscard]] CardInfoPtr getCardInfo(const QString &cardName) const;
[[nodiscard]] QList<CardInfoPtr> getCardInfos(const QStringList &cardNames) const; [[nodiscard]] QList<CardInfoPtr> getCardInfos(const QStringList &cardNames) const;
@ -53,7 +53,7 @@ public:
private: private:
const CardDatabase *db; const CardDatabase *db;
std::shared_ptr<ICardPreferenceProvider> prefs; QSharedPointer<ICardPreferenceProvider> prefs;
CardInfoPtr lookupCardByName(const QString &name) const; CardInfoPtr lookupCardByName(const QString &name) const;
}; };

1
cockatrice/src/database/interface/interface_card_preference_provider.cpp
View file

@ -1 +0,0 @@
#include "../../utility/interface_card_preference_provider.h"

1
cockatrice/src/database/interface/noop_card_preference_provider.cpp
View file

@ -1 +0,0 @@
#include "noop_card_preference_provider.h"

1
cockatrice/src/database/interface/settings_card_preference_provider.cpp
View file

@ -1 +0,0 @@
#include "../../utility/settings_card_preference_provider.h"

2
dbconverter/src/main.h
View file

@ -12,7 +12,7 @@ public:
{ {
// Replace querier with one that ignores SettingsCache // Replace querier with one that ignores SettingsCache
delete querier; delete querier;
querier = new CardDatabaseQuerier(this, this, std::make_shared<NoopCardPreferenceProvider>()); querier = new CardDatabaseQuerier(this, this, QSharedPointer<NoopCardPreferenceProvider>::create());
}; };
LoadStatus loadCardDatabase(const QString &path) LoadStatus loadCardDatabase(const QString &path)