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 d2a43be3e..11bd87e19 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector.cpp @@ -224,8 +224,8 @@ void PrintingSelector::getAllSetsForCurrentCard() return; } - PrintingInfoPerSetMap perSetMap = selectedCard->getSets(); - const QList sortedPrintings = sortToolBar->sortSets(perSetMap); + SetToPrintingsMap setMap = selectedCard->getSets(); + const QList sortedPrintings = sortToolBar->sortSets(setMap); const QList filteredPrintings = sortToolBar->filterSets(sortedPrintings, searchBar->getSearchText().trimmed().toLower()); QList printingsToUse; 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 0cfc938fb..6a1d22da9 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 @@ -73,14 +73,14 @@ void PrintingSelectorCardSortingWidget::updateSortSetting() * - Contained in Deck * - Potential Cards in Deck * - * @param perSetMap The list of card sets to be sorted. + * @param setMap The list of card sets to be sorted. * @return A sorted list of printings. */ -QList PrintingSelectorCardSortingWidget::sortSets(const PrintingInfoPerSetMap &perSetMap) +QList PrintingSelectorCardSortingWidget::sortSets(const SetToPrintingsMap &setMap) { QList sortedSets; - for (const auto &printingInfos : perSetMap) { + for (const auto &printingInfos : setMap) { for (const auto &set : printingInfos) { sortedSets << set.getSet(); break; @@ -101,7 +101,7 @@ QList PrintingSelectorCardSortingWidget::sortSets(const PrintingIn QList sortedPrintings; // Reconstruct sorted list of CardInfoPerSet for (const auto &set : sortedSets) { - for (auto it = perSetMap.begin(); it != perSetMap.end(); ++it) { + for (auto it = setMap.begin(); it != setMap.end(); ++it) { for (const auto &cardInfoPerSet : it.value()) { if (cardInfoPerSet.getSet() == set) { if (!sortedPrintings.contains(cardInfoPerSet)) { @@ -188,11 +188,11 @@ QList PrintingSelectorCardSortingWidget::prependPrintingsInDeck(co return {}; } - PrintingInfoPerSetMap perSetMap = selectedCard->getSets(); + SetToPrintingsMap setMap = selectedCard->getSets(); QList> countList; // Collect sets with their counts - for (const auto &printingList : perSetMap) { + for (const auto &printingList : setMap) { for (const auto &printing : printingList) { QModelIndex find_card = deckModel->findCard(selectedCard->getName(), DECK_ZONE_MAIN, printing.getProperty("uuid")); diff --git a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.h b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.h index f8c3cf570..c91b363c9 100644 --- a/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.h +++ b/cockatrice/src/client/ui/widgets/printing_selector/printing_selector_card_sorting_widget.h @@ -12,7 +12,7 @@ class PrintingSelectorCardSortingWidget : public QWidget Q_OBJECT public: explicit PrintingSelectorCardSortingWidget(PrintingSelector *parent); - QList sortSets(const PrintingInfoPerSetMap &perSetMap); + QList sortSets(const SetToPrintingsMap &setMap); QList filterSets(const QList &printings, const QString &searchText); QList prependPinnedPrintings(const QList &printings, const QString &cardName); QList prependPrintingsInDeck(const QList &printings, diff --git a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp index ab398369a..b1d5463ee 100644 --- a/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_database_display/visual_database_display_widget.cpp @@ -230,7 +230,7 @@ void VisualDatabaseDisplayWidget::populateCards() if (CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString())) { if (setFilter) { - PrintingInfoPerSetMap setMap = info->getSets(); + SetToPrintingsMap setMap = info->getSets(); if (setMap.contains(setFilter->term())) { for (PrintingInfo printing : setMap[setFilter->term()]) { addCard(CardDatabaseManager::getInstance()->getCardByNameAndProviderId( @@ -296,7 +296,7 @@ void VisualDatabaseDisplayWidget::loadNextPage() QVariant name = databaseDisplayModel->data(index, Qt::DisplayRole); if (CardInfoPtr info = CardDatabaseManager::getInstance()->getCard(name.toString())) { if (setFilter) { - PrintingInfoPerSetMap setMap = info->getSets(); + SetToPrintingsMap setMap = info->getSets(); if (setMap.contains(setFilter->term())) { for (PrintingInfo printing : setMap[setFilter->term()]) { addCard(CardDatabaseManager::getInstance()->getCardByNameAndProviderId( diff --git a/cockatrice/src/dialogs/dlg_edit_tokens.cpp b/cockatrice/src/dialogs/dlg_edit_tokens.cpp index cfdc11549..a93a77963 100644 --- a/cockatrice/src/dialogs/dlg_edit_tokens.cpp +++ b/cockatrice/src/dialogs/dlg_edit_tokens.cpp @@ -162,7 +162,7 @@ void DlgEditTokens::actAddToken() } QString setName = CardSet::TOKENS_SETNAME; - PrintingInfoPerSetMap sets; + SetToPrintingsMap sets; sets[setName].append(PrintingInfo(databaseModel->getDatabase()->getSet(setName))); CardInfoPtr card = CardInfo::newInstance(name, "", true, QVariantHash(), QList(), QList(), sets, false, false, -1, false); diff --git a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp index e88385e84..d6067644e 100644 --- a/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp +++ b/cockatrice/src/dialogs/dlg_select_set_for_cards.cpp @@ -226,8 +226,8 @@ QMap DlgSelectSetForCards::getSetsForCards() if (!infoPtr) continue; - PrintingInfoPerSetMap perSetMap = infoPtr->getSets(); - for (auto it = perSetMap.begin(); it != perSetMap.end(); ++it) { + SetToPrintingsMap setMap = infoPtr->getSets(); + for (auto it = setMap.begin(); it != setMap.end(); ++it) { setCounts[it.key()]++; } } @@ -380,8 +380,8 @@ QMap DlgSelectSetForCards::getCardsForSets() if (!infoPtr) continue; - PrintingInfoPerSetMap perSetMap = infoPtr->getSets(); - for (auto it = perSetMap.begin(); it != perSetMap.end(); ++it) { + SetToPrintingsMap setMap = infoPtr->getSets(); + for (auto it = setMap.begin(); it != setMap.end(); ++it) { setCards[it.key()].append(currentCard->getName()); } } diff --git a/cockatrice/src/game/board/abstract_card_item.cpp b/cockatrice/src/game/board/abstract_card_item.cpp index 61d3ac00d..b93ad7271 100644 --- a/cockatrice/src/game/board/abstract_card_item.cpp +++ b/cockatrice/src/game/board/abstract_card_item.cpp @@ -67,7 +67,7 @@ void AbstractCardItem::refreshCardInfo() QVariantHash properties = QVariantHash(); info = CardInfo::newInstance(name, "", true, QVariantHash(), QList(), QList(), - PrintingInfoPerSetMap(), false, false, -1, false); + SetToPrintingsMap(), false, false, -1, false); } if (info.data()) { connect(info.data(), &CardInfo::pixmapUpdated, this, &AbstractCardItem::pixmapUpdated); diff --git a/cockatrice/src/game/cards/card_database.cpp b/cockatrice/src/game/cards/card_database.cpp index b6e61af04..994664d6e 100644 --- a/cockatrice/src/game/cards/card_database.cpp +++ b/cockatrice/src/game/cards/card_database.cpp @@ -316,7 +316,7 @@ PrintingInfo CardDatabase::getPreferredPrinting(const QString &cardName) const return PrintingInfo(nullptr); } - PrintingInfoPerSetMap setMap = cardInfo->getSets(); + SetToPrintingsMap setMap = cardInfo->getSets(); if (setMap.empty()) { return PrintingInfo(nullptr); } @@ -349,7 +349,7 @@ PrintingInfo CardDatabase::getSpecificPrinting(const QString &cardName, const QS return PrintingInfo(nullptr); } - PrintingInfoPerSetMap setMap = cardInfo->getSets(); + SetToPrintingsMap setMap = cardInfo->getSets(); if (setMap.empty()) { return PrintingInfo(nullptr); } @@ -378,7 +378,7 @@ PrintingInfo CardDatabase::getSpecificPrinting(const QString &cardName, return PrintingInfo(nullptr); } - PrintingInfoPerSetMap setMap = cardInfo->getSets(); + SetToPrintingsMap setMap = cardInfo->getSets(); if (setMap.empty()) { return PrintingInfo(nullptr); } @@ -426,7 +426,7 @@ bool CardDatabase::isProviderIdForPreferredPrinting(const QString &cardName, con PrintingInfo CardDatabase::getSetInfoForCard(const CardInfoPtr &_card) { - const PrintingInfoPerSetMap &setMap = _card->getSets(); + const SetToPrintingsMap &setMap = _card->getSets(); if (setMap.empty()) { return PrintingInfo(nullptr); } 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 fe7be88e4..1f69079cd 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 @@ -160,7 +160,7 @@ void CockatriceXml3Parser::loadCardsFromXml(QXmlStreamReader &xml) QVariantHash properties = QVariantHash(); QString colors = QString(""); QList relatedCards, reverseRelatedCards; - auto _sets = PrintingInfoPerSetMap(); + auto _sets = SetToPrintingsMap(); int tableRow = 0; bool cipt = false; bool landscapeOrientation = false; @@ -343,8 +343,8 @@ static QXmlStreamWriter &operator<<(QXmlStreamWriter &xml, const CardInfoPtr &in } // sets - const PrintingInfoPerSetMap perSetMap = info->getSets(); - for (const auto &printings : perSetMap) { + const SetToPrintingsMap setMap = info->getSets(); + for (const auto &printings : setMap) { for (const PrintingInfo &set : printings) { xml.writeStartElement("set"); xml.writeAttribute("rarity", set.getProperty("rarity")); 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 0cc3f42a3..f9f6a98d4 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 @@ -144,7 +144,7 @@ void CockatriceXml4Parser::loadCardsFromXml(QXmlStreamReader &xml) QString text = QString(""); QVariantHash properties = QVariantHash(); QList relatedCards, reverseRelatedCards; - auto _sets = PrintingInfoPerSetMap(); + auto _sets = SetToPrintingsMap(); int tableRow = 0; bool cipt = false; bool landscapeOrientation = false; diff --git a/cockatrice/src/game/cards/card_info.cpp b/cockatrice/src/game/cards/card_info.cpp index 76719d3e1..76bc3a26b 100644 --- a/cockatrice/src/game/cards/card_info.cpp +++ b/cockatrice/src/game/cards/card_info.cpp @@ -225,7 +225,7 @@ CardInfo::CardInfo(const QString &_name, QVariantHash _properties, const QList &_relatedCards, const QList &_reverseRelatedCards, - PrintingInfoPerSetMap _sets, + SetToPrintingsMap _sets, bool _cipt, bool _landscapeOrientation, int _tableRow, @@ -248,7 +248,7 @@ CardInfo::~CardInfo() CardInfoPtr CardInfo::newInstance(const QString &_name) { return newInstance(_name, QString(), false, QVariantHash(), QList(), QList(), - PrintingInfoPerSetMap(), false, false, 0, false); + SetToPrintingsMap(), false, false, 0, false); } CardInfoPtr CardInfo::newInstance(const QString &_name, @@ -257,7 +257,7 @@ CardInfoPtr CardInfo::newInstance(const QString &_name, QVariantHash _properties, const QList &_relatedCards, const QList &_reverseRelatedCards, - PrintingInfoPerSetMap _sets, + SetToPrintingsMap _sets, bool _cipt, bool _landscapeOrientation, int _tableRow, diff --git a/cockatrice/src/game/cards/card_info.h b/cockatrice/src/game/cards/card_info.h index 69d047bac..7429feb5b 100644 --- a/cockatrice/src/game/cards/card_info.h +++ b/cockatrice/src/game/cards/card_info.h @@ -22,7 +22,7 @@ class ICardDatabaseParser; typedef QSharedPointer CardInfoPtr; typedef QSharedPointer CardSetPtr; -typedef QMap> PrintingInfoPerSetMap; +typedef QMap> SetToPrintingsMap; typedef QHash CardNameMap; typedef QHash SetNameMap; @@ -204,7 +204,7 @@ private: // the cards thare are reverse-related to me QList reverseRelatedCardsToMe; // card sets - PrintingInfoPerSetMap sets; + SetToPrintingsMap sets; // cached set names QString setsNames; // positioning properties; used by UI @@ -220,7 +220,7 @@ public: QVariantHash _properties, const QList &_relatedCards, const QList &_reverseRelatedCards, - PrintingInfoPerSetMap _sets, + SetToPrintingsMap _sets, bool _cipt, bool _landscapeOrientation, int _tableRow, @@ -243,7 +243,7 @@ public: QVariantHash _properties, const QList &_relatedCards, const QList &_reverseRelatedCards, - PrintingInfoPerSetMap _sets, + SetToPrintingsMap _sets, bool _cipt, bool _landscapeOrientation, int _tableRow, @@ -311,7 +311,7 @@ public: { return properties.contains(propertyName); } - const PrintingInfoPerSetMap &getSets() const + const SetToPrintingsMap &getSets() const { return sets; } diff --git a/oracle/src/oracleimporter.cpp b/oracle/src/oracleimporter.cpp index 6cd7c5641..0fd2beaa7 100644 --- a/oracle/src/oracleimporter.cpp +++ b/oracle/src/oracleimporter.cpp @@ -200,7 +200,7 @@ CardInfoPtr OracleImporter::addCard(QString name, // insert the card and its properties QList reverseRelatedCards; - PrintingInfoPerSetMap setsInfo; + SetToPrintingsMap setsInfo; setsInfo[printingInfo.getSet()->getShortName()].append(printingInfo); CardInfoPtr newCard = CardInfo::newInstance(name, text, isToken, properties, relatedCards, reverseRelatedCards, setsInfo, cipt, landscapeOrientation, tableRow, upsideDown);