diff --git a/cockatrice/src/game/cards/card_info.cpp b/cockatrice/src/game/cards/card_info.cpp index 1f65b40cc..4b50e1b0a 100644 --- a/cockatrice/src/game/cards/card_info.cpp +++ b/cockatrice/src/game/cards/card_info.cpp @@ -231,7 +231,7 @@ CardInfo::CardInfo(const QString &_name, int _tableRow, bool _upsideDownArt) : name(_name), text(_text), isToken(_isToken), properties(std::move(_properties)), relatedCards(_relatedCards), - reverseRelatedCards(_reverseRelatedCards), sets(std::move(_sets)), cipt(_cipt), + reverseRelatedCards(_reverseRelatedCards), setsToPrintings(std::move(_sets)), cipt(_cipt), landscapeOrientation(_landscapeOrientation), tableRow(_tableRow), upsideDownArt(_upsideDownArt) { pixmapCacheKey = QLatin1String("card_") + name; @@ -294,8 +294,8 @@ void CardInfo::addToSet(const CardSetPtr &_set, const PrintingInfo _info) if (!_set->contains(smartThis)) { _set->append(smartThis); } - if (!sets[_set->getShortName()].contains(_info)) { - sets[_set->getShortName()].append(_info); + if (!setsToPrintings[_set->getShortName()].contains(_info)) { + setsToPrintings[_set->getShortName()].append(_info); } refreshCachedSetNames(); @@ -316,7 +316,7 @@ void CardInfo::refreshCachedSetNames() { QStringList setList; // update the cached list of set names - for (const auto &printings : sets) { + for (const auto &printings : setsToPrintings) { for (const auto &printing : printings) { if (printing.getSet()->getEnabled()) { setList << printing.getSet()->getShortName(); diff --git a/cockatrice/src/game/cards/card_info.h b/cockatrice/src/game/cards/card_info.h index 7429feb5b..4f58795ab 100644 --- a/cockatrice/src/game/cards/card_info.h +++ b/cockatrice/src/game/cards/card_info.h @@ -204,7 +204,7 @@ private: // the cards thare are reverse-related to me QList reverseRelatedCardsToMe; // card sets - SetToPrintingsMap sets; + SetToPrintingsMap setsToPrintings; // cached set names QString setsNames; // positioning properties; used by UI @@ -229,7 +229,7 @@ public: : QObject(other.parent()), name(other.name), simpleName(other.simpleName), pixmapCacheKey(other.pixmapCacheKey), text(other.text), isToken(other.isToken), properties(other.properties), relatedCards(other.relatedCards), reverseRelatedCards(other.reverseRelatedCards), reverseRelatedCardsToMe(other.reverseRelatedCardsToMe), - sets(other.sets), setsNames(other.setsNames), cipt(other.cipt), + setsToPrintings(other.setsToPrintings), setsNames(other.setsNames), cipt(other.cipt), landscapeOrientation(other.landscapeOrientation), tableRow(other.tableRow), upsideDownArt(other.upsideDownArt) { } @@ -313,7 +313,7 @@ public: } const SetToPrintingsMap &getSets() const { - return sets; + return setsToPrintings; } const QString &getSetsNames() const { @@ -321,17 +321,17 @@ public: } QString getSetProperty(const QString &setName, const QString &propertyName) const { - if (!sets.contains(setName)) + if (!setsToPrintings.contains(setName)) return ""; - for (const auto &set : sets[setName]) { + for (const auto &set : setsToPrintings[setName]) { if (QLatin1String("card_") + this->getName() + QString("_") + QString(set.getProperty("uuid")) == this->getPixmapCacheKey()) { return set.getProperty(propertyName); } } - return sets[setName][0].getProperty(propertyName); + return setsToPrintings[setName][0].getProperty(propertyName); } // related cards