diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp index 35e2f3d83..ea5340ba4 100644 --- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp +++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_3.cpp @@ -158,10 +158,10 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml) auto xmlName = xml.name().toString(); if (xmlName == "card") { - QString name = QString(""); - QString text = QString(""); - QVariantHash properties = QVariantHash(); - QString colors = QString(""); + auto name = QString(""); + auto text = QString(""); + auto properties = QVariantHash(); + auto colors = QString(""); QList relatedCards, reverseRelatedCards; auto _sets = SetToPrintingsMap(); int tableRow = 0; @@ -235,7 +235,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml) _sets[setName].append(setInfo); // related cards } else if (xmlName == "related" || xmlName == "reverse-related") { - CardRelationType attach = CardRelationType::DoesNotAttach; + auto attach = CardRelationType::DoesNotAttach; bool exclude = false; bool variable = false; int count = 1; diff --git a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp index ab4c8002d..bf28b5808 100644 --- a/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp +++ b/libcockatrice_card/libcockatrice/card/database/parser/cockatrice_xml_4.cpp @@ -120,7 +120,7 @@ void CockatriceXml4Parser::loadSetsFromXml(QXmlStreamReader &xml) QVariantHash CockatriceXml4Parser::loadCardPropertiesFromXml(QXmlStreamReader &xml) { - QVariantHash properties = QVariantHash(); + auto properties = QVariantHash(); while (!xml.atEnd()) { if (xml.readNext() == QXmlStreamReader::EndElement) { break; @@ -145,9 +145,9 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml) auto xmlName = xml.name().toString(); if (xmlName == "card") { - QString name = QString(""); - QString text = QString(""); - QVariantHash properties = QVariantHash(); + auto name = QString(""); + auto text = QString(""); + auto properties = QVariantHash(); QList relatedCards, reverseRelatedCards; auto _sets = SetToPrintingsMap(); int tableRow = 0; @@ -210,7 +210,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml) } // related cards } else if (xmlName == "related" || xmlName == "reverse-related") { - CardRelationType attachType = CardRelationType::DoesNotAttach; + auto attachType = CardRelationType::DoesNotAttach; bool exclude = false; bool variable = false; bool persistent = false; diff --git a/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp b/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp index 8d6aa7365..aed167bc7 100644 --- a/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp +++ b/libcockatrice_card/libcockatrice/card/set/card_set_list.cpp @@ -45,7 +45,7 @@ int CardSetList::getUnknownSetsNum() QStringList CardSetList::getUnknownSetsNames() { - QStringList sets = QStringList(); + auto sets = QStringList(); for (int i = 0; i < size(); ++i) { CardSetPtr set = at(i); if (set && !set->getIsKnown() && !set->getIsKnownIgnored()) {