From 4f67e69390d98b00b1ef1d8d046d4943ef474ada Mon Sep 17 00:00:00 2001 From: RickyRister Date: Mon, 7 Jul 2025 00:56:56 -0700 Subject: [PATCH] rename variables again --- .../ui/picture_loader/picture_to_load.cpp | 14 ++++++------- .../printing_selector_card_sorting_widget.cpp | 10 +++++----- cockatrice/src/game/cards/card_database.cpp | 20 +++++++++---------- .../src/game/cards/card_database_model.cpp | 6 +++--- cockatrice/src/game/cards/card_info.cpp | 8 ++++---- cockatrice/src/game/filters/filter_string.cpp | 6 +++--- cockatrice/src/game/filters/filter_tree.cpp | 10 +++++----- 7 files changed, 37 insertions(+), 37 deletions(-) diff --git a/cockatrice/src/client/ui/picture_loader/picture_to_load.cpp b/cockatrice/src/client/ui/picture_loader/picture_to_load.cpp index 3ffd9011c..96a858fac 100644 --- a/cockatrice/src/client/ui/picture_loader/picture_to_load.cpp +++ b/cockatrice/src/client/ui/picture_loader/picture_to_load.cpp @@ -28,9 +28,9 @@ PictureToLoad::PictureToLoad(CardInfoPtr _card) QList PictureToLoad::extractSetsSorted(const CardInfoPtr &card) { QList sortedSets; - for (const auto &cardInfoPerSetList : card->getSets()) { - for (const auto &set : cardInfoPerSetList) { - sortedSets << set.getSet(); + for (const auto &printings : card->getSets()) { + for (const auto &printing : printings) { + sortedSets << printing.getSet(); } } if (sortedSets.empty()) { @@ -41,11 +41,11 @@ QList PictureToLoad::extractSetsSorted(const 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 &cardInfoPerSetList : card->getSets()) { - for (const auto &set : cardInfoPerSetList) { - if (QLatin1String("card_") + card->getName() + QString("_") + QString(set.getProperty("uuid")) == + for (const auto &printings : card->getSets()) { + for (const auto &printing : printings) { + if (QLatin1String("card_") + card->getName() + QString("_") + QString(printing.getProperty("uuid")) == card->getPixmapCacheKey()) { - long long setIndex = sortedSets.indexOf(set.getSet()); + long long setIndex = sortedSets.indexOf(printing.getSet()); CardSetPtr setForCardProviderID = sortedSets.takeAt(setIndex); sortedSets.prepend(setForCardProviderID); } 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 6a1d22da9..348e5cb1d 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 @@ -99,13 +99,13 @@ QList PrintingSelectorCardSortingWidget::sortSets(const SetToPrint } QList sortedPrintings; - // Reconstruct sorted list of CardInfoPerSet + // Reconstruct sorted list of PrintingInfo for (const auto &set : sortedSets) { for (auto it = setMap.begin(); it != setMap.end(); ++it) { - for (const auto &cardInfoPerSet : it.value()) { - if (cardInfoPerSet.getSet() == set) { - if (!sortedPrintings.contains(cardInfoPerSet)) { - sortedPrintings << cardInfoPerSet; + for (const auto &printingInfo : it.value()) { + if (printingInfo.getSet() == set) { + if (!sortedPrintings.contains(printingInfo)) { + sortedPrintings << printingInfo; } } } diff --git a/cockatrice/src/game/cards/card_database.cpp b/cockatrice/src/game/cards/card_database.cpp index 994664d6e..60f464c10 100644 --- a/cockatrice/src/game/cards/card_database.cpp +++ b/cockatrice/src/game/cards/card_database.cpp @@ -147,12 +147,12 @@ CardInfoPtr CardDatabase::getCardByNameAndProviderId(const QString &cardName, co return info; } - for (const auto &cardInfoPerSetList : info->getSets()) { - for (const auto &set : cardInfoPerSetList) { - if (set.getProperty("uuid") == providerId) { + for (const auto &printings : info->getSets()) { + for (const auto &printing : printings) { + if (printing.getProperty("uuid") == providerId) { CardInfoPtr cardFromSpecificSet = info->clone(); cardFromSpecificSet->setPixmapCacheKey(QLatin1String("card_") + QString(info->getName()) + - QString("_") + QString(set.getProperty("uuid"))); + QString("_") + QString(printing.getProperty("uuid"))); return cardFromSpecificSet; } } @@ -354,8 +354,8 @@ PrintingInfo CardDatabase::getSpecificPrinting(const QString &cardName, const QS return PrintingInfo(nullptr); } - for (const auto &cardInfoPerSetList : setMap) { - for (auto &cardInfoForSet : cardInfoPerSetList) { + for (const auto &printings : setMap) { + for (auto &cardInfoForSet : printings) { if (cardInfoForSet.getProperty("uuid") == providerId) { return cardInfoForSet; } @@ -383,8 +383,8 @@ PrintingInfo CardDatabase::getSpecificPrinting(const QString &cardName, return PrintingInfo(nullptr); } - for (const auto &cardInfoPerSetList : setMap) { - for (auto &cardInfoForSet : cardInfoPerSetList) { + for (const auto &printings : setMap) { + for (auto &cardInfoForSet : printings) { if (collectorNumber != nullptr) { if (cardInfoForSet.getSet()->getShortName() == setShortName && cardInfoForSet.getProperty("num") == collectorNumber) { @@ -431,8 +431,8 @@ PrintingInfo CardDatabase::getSetInfoForCard(const CardInfoPtr &_card) return PrintingInfo(nullptr); } - for (const auto &cardInfoPerSetList : setMap) { - for (const auto &cardInfoForSet : cardInfoPerSetList) { + for (const auto &printings : setMap) { + for (const auto &cardInfoForSet : printings) { if (QLatin1String("card_") + _card->getName() + QString("_") + cardInfoForSet.getProperty("uuid") == _card->getPixmapCacheKey()) { return cardInfoForSet; diff --git a/cockatrice/src/game/cards/card_database_model.cpp b/cockatrice/src/game/cards/card_database_model.cpp index 4010ba7b3..6d99e563b 100644 --- a/cockatrice/src/game/cards/card_database_model.cpp +++ b/cockatrice/src/game/cards/card_database_model.cpp @@ -98,9 +98,9 @@ bool CardDatabaseModel::checkCardHasAtLeastOneEnabledSet(CardInfoPtr card) if (!showOnlyCardsFromEnabledSets) return true; - for (const auto &cardInfoPerSetList : card->getSets()) { - for (const auto &set : cardInfoPerSetList) { - if (set.getSet()->getEnabled()) + for (const auto &printings : card->getSets()) { + for (const auto &printing : printings) { + if (printing.getSet()->getEnabled()) return true; } } diff --git a/cockatrice/src/game/cards/card_info.cpp b/cockatrice/src/game/cards/card_info.cpp index 76bc3a26b..1f65b40cc 100644 --- a/cockatrice/src/game/cards/card_info.cpp +++ b/cockatrice/src/game/cards/card_info.cpp @@ -316,10 +316,10 @@ void CardInfo::refreshCachedSetNames() { QStringList setList; // update the cached list of set names - for (const auto &cardInfoPerSetList : sets) { - for (const auto &set : cardInfoPerSetList) { - if (set.getSet()->getEnabled()) { - setList << set.getSet()->getShortName(); + for (const auto &printings : sets) { + for (const auto &printing : printings) { + if (printing.getSet()->getEnabled()) { + setList << printing.getSet()->getShortName(); } break; } diff --git a/cockatrice/src/game/filters/filter_string.cpp b/cockatrice/src/game/filters/filter_string.cpp index f2a677d2d..4a7a58b9e 100644 --- a/cockatrice/src/game/filters/filter_string.cpp +++ b/cockatrice/src/game/filters/filter_string.cpp @@ -130,9 +130,9 @@ static void setupParserRules() const auto rarity = std::any_cast(sv[0]); return [=](const CardData &x) -> bool { QList infos; - for (const auto &setsValue : x->getSets().values()) { - for (const auto &cardInfoPerSet : setsValue) { - infos.append(cardInfoPerSet); + for (const auto &printings : x->getSets()) { + for (const auto &printing : printings) { + infos.append(printing); } } diff --git a/cockatrice/src/game/filters/filter_tree.cpp b/cockatrice/src/game/filters/filter_tree.cpp index 5ce84f329..89b772b8e 100644 --- a/cockatrice/src/game/filters/filter_tree.cpp +++ b/cockatrice/src/game/filters/filter_tree.cpp @@ -215,8 +215,8 @@ bool FilterItem::acceptText(const CardInfoPtr info) const bool FilterItem::acceptSet(const CardInfoPtr info) const { bool status = false; - for (const auto &cardInfoPerSetList : info->getSets()) { - for (const auto &set : cardInfoPerSetList) { + for (const auto &printings : info->getSets()) { + for (const auto &set : printings) { if (set.getSet()->getShortName().compare(term, Qt::CaseInsensitive) == 0 || set.getSet()->getLongName().compare(term, Qt::CaseInsensitive) == 0) { status = true; @@ -350,9 +350,9 @@ bool FilterItem::acceptRarity(const CardInfoPtr info) const } } - for (const auto &cardInfoPerSetList : info->getSets()) { - for (const auto &set : cardInfoPerSetList) { - if (set.getProperty("rarity").compare(converted_term, Qt::CaseInsensitive) == 0) { + for (const auto &printings : info->getSets()) { + for (const auto &printing : printings) { + if (printing.getProperty("rarity").compare(converted_term, Qt::CaseInsensitive) == 0) { return true; } }