From cdc6e97d987f5e44f029f07bcb85a0f32d60c808 Mon Sep 17 00:00:00 2001 From: Cameron McDonald Date: Thu, 15 Aug 2024 19:19:02 -0500 Subject: [PATCH] revert changes to CockatriceXml3Parser --- .../game/cards/card_database_parser/cockatrice_xml_3.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp index 01e202e40..24106a3f4 100644 --- a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp +++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_3.cpp @@ -77,7 +77,6 @@ void CockatriceXml3Parser::loadSetsFromXml(QXmlStreamReader &xml) if (name == "set") { QString shortName, longName, setType; QDate releaseDate; - short priority; while (!xml.atEnd()) { if (xml.readNext() == QXmlStreamReader::EndElement) { break; @@ -93,15 +92,13 @@ void CockatriceXml3Parser::loadSetsFromXml(QXmlStreamReader &xml) } else if (name == "releasedate") { releaseDate = QDate::fromString(xml.readElementText(QXmlStreamReader::IncludeChildElements), Qt::ISODate); - } else if (name == "priority") { - priority = xml.readElementText(QXmlStreamReader::IncludeChildElements).toShort(); } else if (!name.isEmpty()) { qDebug() << "[CockatriceXml3Parser] Unknown set property" << name << ", trying to continue anyway"; xml.skipCurrentElement(); } } - internalAddSet(shortName, longName, setType, releaseDate, static_cast(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("settype", set->getSetType()); xml.writeTextElement("releasedate", set->getReleaseDate().toString(Qt::ISODate)); - xml.writeTextElement("priority", QString::number(set->getPriority())); xml.writeEndElement(); return xml;