jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-06-15 11:38:49 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 4

Duplicate cards & empty setlist (#3283)

Browse source 
* Card duplicates handled

* clangify

* kinda works, some cards are still duplicated

* separate card entries grouped together

* clangify
This commit is contained in:
David Szabo 2018-06-17 04:42:22 +02:00 • committed by Zach H
parent 81803e2612
commit d36f86c523
5 changed files with 35 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

1
cockatrice/src/carddbparser/carddatabaseparser.h
View file

@ -15,6 +15,7 @@ public:
virtual bool getCanParseFile(const QString &name, QIODevice &device) = 0;
virtual void parseFile(QIODevice &device) = 0;
virtual bool saveToFile(SetNameMap sets, CardNameMap cards, const QString &fileName) = 0;
virtual void clearSetlist() = 0;
signals:
virtual void addCard(CardInfoPtr card) = 0;
};

5
cockatrice/src/carddbparser/cockatricexml3.cpp
View file

@ -80,6 +80,11 @@ CardSetPtr CockatriceXml3Parser::internalAddSet(const QString &setName,
return newSet;
}
void CockatriceXml3Parser::clearSetlist()
{
sets.clear();
}
void CockatriceXml3Parser::loadSetsFromXml(QXmlStreamReader &xml)
{
while (!xml.atEnd()) {

1
cockatrice/src/carddbparser/cockatricexml3.h
View file

@ -15,6 +15,7 @@ public:
bool getCanParseFile(const QString &name, QIODevice &device);
void parseFile(QIODevice &device);
bool saveToFile(SetNameMap sets, CardNameMap cards, const QString &fileName);
void clearSetlist();
private:
/*