diff --git a/cockatrice/src/client/ui/picture_loader.cpp b/cockatrice/src/client/ui/picture_loader.cpp index 2f8d4bab8..8eb4a7fb9 100644 --- a/cockatrice/src/client/ui/picture_loader.cpp +++ b/cockatrice/src/client/ui/picture_loader.cpp @@ -32,8 +32,8 @@ PictureToLoad::PictureToLoad(CardInfoPtr _card) : card(std::move(_card)), urlTemplates(SettingsCache::instance().downloads().getAllURLs()) { if (card) { - for (const auto &x : card->getSets()) { - for (const auto &set : x) { + for (const auto &cardInfoPerSetList : card->getSets()) { + for (const auto &set : cardInfoPerSetList) { sortedSets << set.getPtr(); } } @@ -45,8 +45,8 @@ PictureToLoad::PictureToLoad(CardInfoPtr _card) // If the user hasn't disabled arts other than their personal preference... if (!SettingsCache::instance().getOverrideAllCardArtWithPersonalPreference()) { // If the pixmapCacheKey corresponds to a specific set, we have to try to load it first. - for (const auto &x : card->getSets()) { - for (const auto &set : x) { + for (const auto &cardInfoPerSetList : card->getSets()) { + for (const auto &set : cardInfoPerSetList) { if (QLatin1String("card_") + card->getName() + QString("_") + QString(set.getProperty("uuid")) == card->getPixmapCacheKey()) { long long setIndex = sortedSets.indexOf(set.getPtr()); diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp index 4699c6956..7c7c3a68d 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp @@ -116,8 +116,8 @@ CardInfoPerSet PrintingSelector::getSetForUUID(const QString &uuid) { CardInfoPerSetMap cardInfoPerSets = selectedCard->getSets(); - for (const auto &x : cardInfoPerSets) { - for (const auto &cardInfoPerSet : x) { + for (const auto &cardInfoPerSetList : cardInfoPerSets) { + for (const auto &cardInfoPerSet : cardInfoPerSetList) { if (cardInfoPerSet.getProperty("uuid") == uuid) { return cardInfoPerSet; } diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp index d0fbf6346..a0d700170 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.cpp @@ -44,8 +44,8 @@ QList PrintingSelectorCardSortingWidget::sortSets(CardInfoPerSet { QList sortedSets; - for (const auto &x : cardInfoPerSets) { - for (const auto &set : x) { + for (const auto &cardInfoPerSetList : cardInfoPerSets) { + for (const auto &set : cardInfoPerSetList) { sortedSets << set.getPtr(); break; } @@ -66,8 +66,8 @@ QList PrintingSelectorCardSortingWidget::sortSets(CardInfoPerSet // Reconstruct sorted list of CardInfoPerSet for (const auto &set : sortedSets) { for (auto it = cardInfoPerSets.begin(); it != cardInfoPerSets.end(); ++it) { - for (const auto &x : it.value()) { - if (x.getPtr() == set) { + for (const auto &cardInfoPerSet : it.value()) { + if (cardInfoPerSet.getPtr() == set) { sortedCardInfoPerSets << it.value(); break; } @@ -115,8 +115,8 @@ QList PrintingSelectorCardSortingWidget::prependPrintingsInDeck( QList> countList; // Collect sets with their counts - for (const auto &x : cardInfoPerSets) { - for (const auto &cardInfoPerSet : x) { + for (const auto &cardInfoPerSetList : cardInfoPerSets) { + for (const auto &cardInfoPerSet : cardInfoPerSetList) { QModelIndex find_card = deckModel->findCard(selectedCard->getName(), DECK_ZONE_MAIN, cardInfoPerSet.getProperty("uuid")); if (find_card.isValid()) { diff --git a/cockatrice/src/game/cards/card_database.cpp b/cockatrice/src/game/cards/card_database.cpp index 74492dfcb..3e58440fd 100644 --- a/cockatrice/src/game/cards/card_database.cpp +++ b/cockatrice/src/game/cards/card_database.cpp @@ -266,8 +266,8 @@ CardInfoPtr CardInfo::newInstance(const QString &_name, _sets, _cipt, _tableRow, _upsideDownArt)); ptr->setSmartPointer(ptr); - for (const auto &x : _sets) { - for (const CardInfoPerSet &set : x) { + for (const auto &cardInfoPerSetList : _sets) { + for (const CardInfoPerSet &set : cardInfoPerSetList) { set.getPtr()->append(ptr); break; } @@ -300,8 +300,8 @@ void CardInfo::refreshCachedSetNames() { QStringList setList; // update the cached list of set names - for (const auto &x : sets) { - for (const auto &set : x) { + for (const auto &cardInfoPerSetList : sets) { + for (const auto &set : cardInfoPerSetList) { if (set.getPtr()->getEnabled()) { setList << set.getPtr()->getShortName(); } @@ -402,8 +402,8 @@ void CardDatabase::addCard(CardInfoPtr card) // if card already exists just add the new set property if (cards.contains(card->getName())) { CardInfoPtr sameCard = cards[card->getName()]; - for (const auto &x : card->getSets()) { - for (const CardInfoPerSet &set : x) { + for (const auto &cardInfoPerSetList : card->getSets()) { + for (const CardInfoPerSet &set : cardInfoPerSetList) { sameCard->addToSet(set.getPtr(), set); } } @@ -464,8 +464,8 @@ CardInfoPtr CardDatabase::getCardByNameAndProviderId(const QString &cardName, co return info; } - for (const auto &x : info->getSets()) { - for (const auto &set : x) { + for (const auto &cardInfoPerSetList : info->getSets()) { + for (const auto &set : cardInfoPerSetList) { if (set.getProperty("uuid") == providerId) { CardInfoPtr cardFromSpecificSet = info->clone(); cardFromSpecificSet->setPixmapCacheKey(QLatin1String("card_") + QString(info->getName()) + @@ -640,8 +640,8 @@ CardInfoPerSet CardDatabase::getPreferredSetForCard(const QString &cardName) con CardInfoPerSet preferredCard; SetPriorityComparator comparator; - for (const auto &x : setMap) { - for (auto &cardInfoForSet : x) { + for (const auto &cardInfoPerSetList : setMap) { + for (auto &cardInfoForSet : cardInfoPerSetList) { CardSetPtr currentSet = cardInfoForSet.getPtr(); if (!preferredSet || comparator(currentSet, preferredSet)) { preferredSet = currentSet; @@ -669,8 +669,8 @@ CardInfoPerSet CardDatabase::getSpecificSetForCard(const QString &cardName, cons return CardInfoPerSet(nullptr); } - for (const auto &x : setMap) { - for (auto &cardInfoForSet : x) { + for (const auto &cardInfoPerSetList : setMap) { + for (auto &cardInfoForSet : cardInfoPerSetList) { if (cardInfoForSet.getProperty("uuid") == providerId) { return cardInfoForSet; } @@ -714,8 +714,8 @@ CardInfoPerSet CardDatabase::getSetInfoForCard(const CardInfoPtr &_card) return CardInfoPerSet(nullptr); } - for (const auto &x : setMap) { - for (auto &cardInfoForSet : x) { + for (const auto &cardInfoPerSetList : setMap) { + for (const auto &cardInfoForSet : cardInfoPerSetList) { if (QLatin1String("card_") + _card->getName() + QString("_") + cardInfoForSet.getProperty("uuid") == _card->getPixmapCacheKey()) { return cardInfoForSet; diff --git a/cockatrice/src/game/cards/card_database.h b/cockatrice/src/game/cards/card_database.h index bd5690894..ea4f8768a 100644 --- a/cockatrice/src/game/cards/card_database.h +++ b/cockatrice/src/game/cards/card_database.h @@ -307,19 +307,6 @@ public: if (!sets.contains(setName)) return ""; - /* - for (const auto &x : card->getSets()) { - for (const auto &set : x) { - if (QLatin1String("card_") + card->getName() + QString("_") + QString(set.getProperty("uuid")) == - card->getPixmapCacheKey()) { - long long setIndex = sortedSets.indexOf(set.getPtr()); - CardSetPtr setForCardProviderID = sortedSets.takeAt(setIndex); - sortedSets.prepend(setForCardProviderID); - } - } - } - */ - for (const auto &set : sets[setName]) { if (QLatin1String("card_") + this->getName() + QString("_") + QString(set.getProperty("uuid")) == this->getPixmapCacheKey()) { diff --git a/cockatrice/src/game/cards/card_database_model.cpp b/cockatrice/src/game/cards/card_database_model.cpp index 3175e5f74..a14a9d494 100644 --- a/cockatrice/src/game/cards/card_database_model.cpp +++ b/cockatrice/src/game/cards/card_database_model.cpp @@ -97,8 +97,8 @@ bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(CardInfoPtr card) if (!showOnlyCardsFromEnabledSets) return true; - for (const auto &x : card->getSets()) { - for (const auto &set : x) { + for (const auto &cardInfoPerSetList : card->getSets()) { + for (const auto &set : cardInfoPerSetList) { if (set.getPtr()->getEnabled()) return true; } 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 fb23d9e8e..97c54e03e 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 @@ -331,8 +331,8 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in // sets const CardInfoPerSetMap sets = info->getSets(); - for (const auto &x : sets) { - for (CardInfoPerSet set : x) { + for (const auto &cardInfoPerSetList : sets) { + for (const CardInfoPerSet& set : cardInfoPerSetList) { xml.writeStartElement("set"); xml.writeAttribute("rarity", set.getProperty("rarity")); xml.writeAttribute("muId", set.getProperty("muid")); diff --git a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp index a9da82e13..49fd86701 100644 --- a/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp +++ b/cockatrice/src/game/cards/card_database_parser/cockatrice_xml_4.cpp @@ -284,10 +284,10 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in xml.writeEndElement(); // sets - for (const auto &x : info->getSets()) { - for (CardInfoPerSet set : x) { + for (const auto &cardInfoPerSetList : info->getSets()) { + for (const CardInfoPerSet &set : cardInfoPerSetList) { xml.writeStartElement("set"); - for (QString propName : set.getProperties()) { + for (const QString& propName : set.getProperties()) { xml.writeAttribute(propName, set.getProperty(propName)); } diff --git a/cockatrice/src/game/filters/filter_tree.cpp b/cockatrice/src/game/filters/filter_tree.cpp index c6fceba5e..d36a1d253 100644 --- a/cockatrice/src/game/filters/filter_tree.cpp +++ b/cockatrice/src/game/filters/filter_tree.cpp @@ -203,8 +203,8 @@ bool FilterItem::acceptText(const CardInfoPtr info) const bool FilterItem::acceptSet(const CardInfoPtr info) const { bool status = false; - for (const auto &x : info->getSets()) { - for (const auto &set : x) { + for (const auto &cardInfoPerSetList : info->getSets()) { + for (const auto &set : cardInfoPerSetList) { if (set.getPtr()->getShortName().compare(term, Qt::CaseInsensitive) == 0 || set.getPtr()->getLongName().compare(term, Qt::CaseInsensitive) == 0) { status = true; @@ -338,8 +338,8 @@ bool FilterItem::acceptRarity(const CardInfoPtr info) const } } - for (const auto &x : info->getSets()) { - for (const auto &set : x) { + for (const auto &cardInfoPerSetList : info->getSets()) { + for (const auto &set : cardInfoPerSetList) { if (set.getProperty("rarity").compare(converted_term, Qt::CaseInsensitive) == 0) { return true; }