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

(My local) Linter was lacking execute permissions.

Browse source 
Took 3 minutes
This commit is contained in:
Lukas Brübach 2025-09-28 19:14:39 +02:00
parent fc6ac89098
commit b288c0e5f6
5 changed files with 12 additions and 6 deletions
Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

@ -7,7 +7,10 @@
#include <qrandom.h> #include <qrandom.h>
CardDatabaseQuerier::CardDatabaseQuerier(QObject *_parent, const CardDatabase *_db, std::shared_ptr<ICardPreferenceProvider> prefs) : QObject(_parent), db(_db), prefs(std::move(prefs)) CardDatabaseQuerier::CardDatabaseQuerier(QObject *_parent,
const CardDatabase *_db,
std::shared_ptr<ICardPreferenceProvider> prefs)
: QObject(_parent), db(_db), prefs(std::move(prefs))
{ {
} }

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

@ -14,7 +14,9 @@ class CardDatabaseQuerier : public QObject
Q_OBJECT Q_OBJECT
public: public:
explicit CardDatabaseQuerier(QObject *parent, const CardDatabase *db, std::shared_ptr<ICardPreferenceProvider> prefs); explicit CardDatabaseQuerier(QObject *parent,
const CardDatabase *db,
std::shared_ptr<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;

3
dbconverter/src/main.h
View file

@ -12,8 +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, querier = new CardDatabaseQuerier(this, this, std::make_shared<NoopCardPreferenceProvider>());
std::make_shared<NoopCardPreferenceProvider>());
}; };
LoadStatus loadCardDatabase(const QString &path) LoadStatus loadCardDatabase(const QString &path)