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

fix signals in CardDatabaseParser

Browse source
This commit is contained in:
RickyRister 2025-01-08 22:45:48 -08:00
parent 0d7669db2c
commit e7475703a5
4 changed files with 5 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/game/cards/card_database.cpp
View file

@ -375,8 +375,8 @@ CardDatabase::CardDatabase(QObject *parent) : QObject(parent), loadStatus(NotLoa
availableParsers << new CockatriceXml3Parser; availableParsers << new CockatriceXml3Parser;
for (auto &parser : availableParsers) { for (auto &parser : availableParsers) {
connect(parser, SIGNAL(addCard(CardInfoPtr)), this, SLOT(addCard(CardInfoPtr)), Qt::DirectConnection); connect(parser, &ICardDatabaseParser::addCard, this, &CardDatabase::addCard, Qt::DirectConnection);
connect(parser, SIGNAL(addSet(CardSetPtr)), this, SLOT(addSet(CardSetPtr)), Qt::DirectConnection); connect(parser, &ICardDatabaseParser::addSet, this, &CardDatabase::addSet, Qt::DirectConnection);
} }
connect(&SettingsCache::instance(), SIGNAL(cardDatabasePathChanged()), this, SLOT(loadCardDatabases())); connect(&SettingsCache::instance(), SIGNAL(cardDatabasePathChanged()), this, SLOT(loadCardDatabases()));

5
cockatrice/src/game/cards/card_database_parser/card_database_parser.h
View file

@ -10,6 +10,7 @@
class ICardDatabaseParser : public QObject class ICardDatabaseParser : public QObject
{ {
Q_OBJECT
public: public:
~ICardDatabaseParser() override = default; ~ICardDatabaseParser() override = default;
@ -35,8 +36,8 @@ protected:
const QDate &releaseDate = QDate(), const QDate &releaseDate = QDate(),
const CardSet::Priority priority = CardSet::PriorityFallback); const CardSet::Priority priority = CardSet::PriorityFallback);
signals: signals:
virtual void addCard(CardInfoPtr card) = 0; void addCard(CardInfoPtr card);
virtual void addSet(CardSetPtr set) = 0; void addSet(CardSetPtr set);
}; };
Q_DECLARE_INTERFACE(ICardDatabaseParser, "ICardDatabaseParser") Q_DECLARE_INTERFACE(ICardDatabaseParser, "ICardDatabaseParser")

3
cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.h
View file

@ -24,9 +24,6 @@ private:
void loadCardsFromXml(QXmlStreamReader &xml); void loadCardsFromXml(QXmlStreamReader &xml);
void loadSetsFromXml(QXmlStreamReader &xml); void loadSetsFromXml(QXmlStreamReader &xml);
QString getMainCardType(QString &type); QString getMainCardType(QString &type);
signals:
void addCard(CardInfoPtr card) override;
void addSet(CardSetPtr set) override;
}; };
#endif #endif

3
cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.h
View file

@ -24,9 +24,6 @@ private:
QVariantHash loadCardPropertiesFromXml(QXmlStreamReader &xml); QVariantHash loadCardPropertiesFromXml(QXmlStreamReader &xml);
void loadCardsFromXml(QXmlStreamReader &xml); void loadCardsFromXml(QXmlStreamReader &xml);
void loadSetsFromXml(QXmlStreamReader &xml); void loadSetsFromXml(QXmlStreamReader &xml);
signals:
void addCard(CardInfoPtr card) override;
void addSet(CardSetPtr set) override;
}; };
#endif #endif