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

revert changes to CockatriceXml3Parser

Browse source
This commit is contained in:
Cameron McDonald 2024-08-15 19:19:02 -05:00
parent bd29ea4215
commit cdc6e97d98
1 changed files with 1 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp
View file

@ -77,7 +77,6 @@ void CockatriceXml3Parser::loadSetsFromXml(QXmlStreamReader &xml)
if (name == "set") { if (name == "set") {
QString shortName, longName, setType; QString shortName, longName, setType;
QDate releaseDate; QDate releaseDate;
short priority;
while (!xml.atEnd()) { while (!xml.atEnd()) {
if (xml.readNext() == QXmlStreamReader::EndElement) { if (xml.readNext() == QXmlStreamReader::EndElement) {
break; break;
@ -93,15 +92,13 @@ void CockatriceXml3Parser::loadSetsFromXml(QXmlStreamReader &xml)
} else if (name == "releasedate") { } else if (name == "releasedate") {
releaseDate = releaseDate =
QDate::fromString(xml.readElementText(QXmlStreamReader::IncludeChildElements), Qt::ISODate); QDate::fromString(xml.readElementText(QXmlStreamReader::IncludeChildElements), Qt::ISODate);
} else if (name == "priority") {
priority = xml.readElementText(QXmlStreamReader::IncludeChildElements).toShort();
} else if (!name.isEmpty()) { } else if (!name.isEmpty()) {
qDebug() << "[CockatriceXml3Parser] Unknown set property" << name << ", trying to continue anyway"; qDebug() << "[CockatriceXml3Parser] Unknown set property" << name << ", trying to continue anyway";
xml.skipCurrentElement(); xml.skipCurrentElement();
} }
} }
internalAddSet(shortName, longName, setType, releaseDate, static_cast<CardSet::Priority>(priority)); internalAddSet(shortName, longName, setType, releaseDate);
} }
} }
} }
@ -289,7 +286,6 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardSetPtr &set
xml.writeTextElement("longname", set->getLongName()); xml.writeTextElement("longname", set->getLongName());
xml.writeTextElement("settype", set->getSetType()); xml.writeTextElement("settype", set->getSetType());
xml.writeTextElement("releasedate", set->getReleaseDate().toString(Qt::ISODate)); xml.writeTextElement("releasedate", set->getReleaseDate().toString(Qt::ISODate));
xml.writeTextElement("priority", QString::number(set->getPriority()));
xml.writeEndElement(); xml.writeEndElement();
return xml; return xml;