jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-12 00:54:53 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Fix #633

Browse source 
Requires #889
This commit is contained in:
Fabio Bas 2015-03-29 18:55:15 +02:00
parent 48d588f6cd
commit 28ec1a7186
2 changed files with 35 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

4
oracle/src/oracleimporter.h
View file

@ -32,7 +32,7 @@ private:
QVariantMap setsMap;
QString dataDir;
CardInfo *addCard(const QString &setName, QString cardName, bool isToken, int cardId, QString &cardCost, QString &cmc, const QString &cardType, const QString &cardPT, int cardLoyalty, const QString &cardText);
CardInfo *addCard(const QString &setName, QString cardName, bool isToken, int cardId, QString &cardCost, QString &cmc, const QString &cardType, const QString &cardPT, int cardLoyalty, const QString &cardText, const QStringList & colors);
signals:
void setIndexChanged(int cardsImported, int setIndex, const QString &setName);
void dataReadProgress(int bytesRead, int totalBytes);
@ -43,6 +43,8 @@ public:
int importTextSpoiler(CardSet *set, const QVariant &data);
QList<SetToDownload> &getSets() { return allSets; }
const QString &getDataDir() const { return dataDir; }
protected:
void extractColors(const QStringList & in, QStringList & out);
};
#endif