From 38e41148f3790f53c86ce62c794ddf0a1660e096 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 28 Sep 2025 19:20:24 +0200 Subject: [PATCH] Change to a QSharedPointer and also delete cpp's for interfaces since they are not QObjects. Took 6 minutes --- cockatrice/src/database/card_database.cpp | 2 +- cockatrice/src/database/card_database.h | 2 +- cockatrice/src/database/card_database_manager.cpp | 2 +- cockatrice/src/database/card_database_querier.cpp | 4 ++-- cockatrice/src/database/card_database_querier.h | 4 ++-- .../database/interface/interface_card_preference_provider.cpp | 1 - .../src/database/interface/noop_card_preference_provider.cpp | 1 - .../database/interface/settings_card_preference_provider.cpp | 1 - dbconverter/src/main.h | 2 +- 9 files changed, 8 insertions(+), 11 deletions(-) delete mode 100644 cockatrice/src/database/interface/interface_card_preference_provider.cpp delete mode 100644 cockatrice/src/database/interface/noop_card_preference_provider.cpp delete mode 100644 cockatrice/src/database/interface/settings_card_preference_provider.cpp diff --git a/cockatrice/src/database/card_database.cpp b/cockatrice/src/database/card_database.cpp index 8b09eb9bd..7fbc9c18c 100644 --- a/cockatrice/src/database/card_database.cpp +++ b/cockatrice/src/database/card_database.cpp @@ -15,7 +15,7 @@ #include #include -CardDatabase::CardDatabase(QObject *parent, std::shared_ptr prefs) +CardDatabase::CardDatabase(QObject *parent, QSharedPointer prefs) : QObject(parent), loadStatus(NotLoaded) { qRegisterMetaType("CardInfoPtr"); diff --git a/cockatrice/src/database/card_database.h b/cockatrice/src/database/card_database.h index 6e95cf68e..1c3425ea2 100644 --- a/cockatrice/src/database/card_database.h +++ b/cockatrice/src/database/card_database.h @@ -52,7 +52,7 @@ private: *removeCardMutex = new QBasicMutex(); public: - explicit CardDatabase(QObject *parent = nullptr, std::shared_ptr prefs = nullptr); + explicit CardDatabase(QObject *parent = nullptr, QSharedPointer prefs = nullptr); ~CardDatabase() override; void removeCard(CardInfoPtr card); diff --git a/cockatrice/src/database/card_database_manager.cpp b/cockatrice/src/database/card_database_manager.cpp index 9902fd27a..782da0133 100644 --- a/cockatrice/src/database/card_database_manager.cpp +++ b/cockatrice/src/database/card_database_manager.cpp @@ -3,7 +3,7 @@ CardDatabase *CardDatabaseManager::getInstance() { static CardDatabase instance( - nullptr, std::make_shared()); // Created only once, on first access + nullptr, QSharedPointer::create()); // Created only once, on first access return &instance; } diff --git a/cockatrice/src/database/card_database_querier.cpp b/cockatrice/src/database/card_database_querier.cpp index 1345242f5..4790f3d70 100644 --- a/cockatrice/src/database/card_database_querier.cpp +++ b/cockatrice/src/database/card_database_querier.cpp @@ -9,8 +9,8 @@ CardDatabaseQuerier::CardDatabaseQuerier(QObject *_parent, const CardDatabase *_db, - std::shared_ptr prefs) - : QObject(_parent), db(_db), prefs(std::move(prefs)) + const QSharedPointer &prefs) + : QObject(_parent), db(_db), prefs(prefs) { } diff --git a/cockatrice/src/database/card_database_querier.h b/cockatrice/src/database/card_database_querier.h index 7227c8125..8989054c5 100644 --- a/cockatrice/src/database/card_database_querier.h +++ b/cockatrice/src/database/card_database_querier.h @@ -16,7 +16,7 @@ class CardDatabaseQuerier : public QObject public: explicit CardDatabaseQuerier(QObject *parent, const CardDatabase *db, - std::shared_ptr prefs); + const QSharedPointer &prefs); [[nodiscard]] CardInfoPtr getCardInfo(const QString &cardName) const; [[nodiscard]] QList getCardInfos(const QStringList &cardNames) const; @@ -53,7 +53,7 @@ public: private: const CardDatabase *db; - std::shared_ptr prefs; + QSharedPointer prefs; CardInfoPtr lookupCardByName(const QString &name) const; }; diff --git a/cockatrice/src/database/interface/interface_card_preference_provider.cpp b/cockatrice/src/database/interface/interface_card_preference_provider.cpp deleted file mode 100644 index 813f06cb6..000000000 --- a/cockatrice/src/database/interface/interface_card_preference_provider.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "../../utility/interface_card_preference_provider.h" diff --git a/cockatrice/src/database/interface/noop_card_preference_provider.cpp b/cockatrice/src/database/interface/noop_card_preference_provider.cpp deleted file mode 100644 index 427819a89..000000000 --- a/cockatrice/src/database/interface/noop_card_preference_provider.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "noop_card_preference_provider.h" diff --git a/cockatrice/src/database/interface/settings_card_preference_provider.cpp b/cockatrice/src/database/interface/settings_card_preference_provider.cpp deleted file mode 100644 index 406583a55..000000000 --- a/cockatrice/src/database/interface/settings_card_preference_provider.cpp +++ /dev/null @@ -1 +0,0 @@ -#include "../../utility/settings_card_preference_provider.h" diff --git a/dbconverter/src/main.h b/dbconverter/src/main.h index ea3e286ad..c0a1fa97f 100644 --- a/dbconverter/src/main.h +++ b/dbconverter/src/main.h @@ -12,7 +12,7 @@ public: { // Replace querier with one that ignores SettingsCache delete querier; - querier = new CardDatabaseQuerier(this, this, std::make_shared()); + querier = new CardDatabaseQuerier(this, this, QSharedPointer::create()); }; LoadStatus loadCardDatabase(const QString &path)