diff --git a/cockatrice/src/game/cards/card_database.cpp b/cockatrice/src/game/cards/card_database.cpp index 00fa4824d..39bc7a499 100644 --- a/cockatrice/src/game/cards/card_database.cpp +++ b/cockatrice/src/game/cards/card_database.cpp @@ -375,8 +375,8 @@ CardDatabase::CardDatabase(QObject *parent) : QObject(parent), loadStatus(NotLoa availableParsers << new CockatriceXml3Parser; for (auto &parser : availableParsers) { - connect(parser, SIGNAL(addCard(CardInfoPtr)), this, SLOT(addCard(CardInfoPtr)), Qt::DirectConnection); - connect(parser, SIGNAL(addSet(CardSetPtr)), this, SLOT(addSet(CardSetPtr)), Qt::DirectConnection); + connect(parser, &ICardDatabaseParser::addCard, this, &CardDatabase::addCard, Qt::DirectConnection); + connect(parser, &ICardDatabaseParser::addSet, this, &CardDatabase::addSet, Qt::DirectConnection); } connect(&SettingsCache::instance(), SIGNAL(cardDatabasePathChanged()), this, SLOT(loadCardDatabases())); diff --git a/cockatrice/src/game/cards/card_database_parser/card_database_parser.h b/cockatrice/src/game/cards/card_database_parser/card_database_parser.h index 87e8eec5e..12da8efbb 100644 --- a/cockatrice/src/game/cards/card_database_parser/card_database_parser.h +++ b/cockatrice/src/game/cards/card_database_parser/card_database_parser.h @@ -10,6 +10,7 @@ class ICardDatabaseParser : public QObject { + Q_OBJECT public: ~ICardDatabaseParser() override = default; @@ -35,8 +36,8 @@ protected: const QDate &releaseDate = QDate(), const CardSet::Priority priority = CardSet::PriorityFallback); signals: - virtual void addCard(CardInfoPtr card) = 0; - virtual void addSet(CardSetPtr set) = 0; + void addCard(CardInfoPtr card); + void addSet(CardSetPtr set); }; Q_DECLARE_INTERFACE(ICardDatabaseParser, "ICardDatabaseParser") diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h index 2006d2203..9e7726e35 100644 --- a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h +++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h @@ -24,9 +24,6 @@ private: void loadCardsFromXml(QXmlStreamReader &xml); void loadSetsFromXml(QXmlStreamReader &xml); QString getMainCardType(QString &type); -signals: - void addCard(CardInfoPtr card) override; - void addSet(CardSetPtr set) override; }; #endif \ No newline at end of file diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h index 59de582a3..82f71324a 100644 --- a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h +++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h @@ -24,9 +24,6 @@ private: QVariantHash loadCardPropertiesFromXml(QXmlStreamReader &xml); void loadCardsFromXml(QXmlStreamReader &xml); void loadSetsFromXml(QXmlStreamReader &xml); -signals: - void addCard(CardInfoPtr card) override; - void addSet(CardSetPtr set) override; }; #endif \ No newline at end of file