[DeckListModel] Refactor: Don't access underlying decklist for iteration

cockatrice/src/interface/widgets/deck_analytics/deck_list_statistics_analyzer.cpp

@@ -21,32 +21,26 @@ void DeckListStatisticsAnalyzer::update()
     manaCurveMap.clear();
     manaDevotionMap.clear();
 
-    auto nodes = model->getDeckList()->getCardNodes();
+    QList<ExactCard> cards = model->getCards();
 
-    for (auto *node : nodes) {
+    for (const ExactCard &card : cards) {
-        CardInfoPtr info = CardDatabaseManager::query()->getCardInfo(node->getName());
+        // ---- Mana curve ----
-        if (!info)
+        if (config.computeManaCurve) {
-            continue;
+            manaCurveMap[card.getInfo().getCmc().toInt()]++;
+        }
 
-        for (int i = 0; i < node->getNumber(); ++i) {
+        // ---- Mana base ----
-            // ---- Mana curve ----
+        if (config.computeManaBase) {
-            if (config.computeManaCurve) {
+            auto mana = determineManaProduction(card.getInfo().getText());
-                manaCurveMap[info->getCmc().toInt()]++;
+            for (auto it = mana.begin(); it != mana.end(); ++it)
-            }
+                manaBaseMap[it.key()] += it.value();
+        }
 
-            // ---- Mana base ----
+        // ---- Devotion ----
-            if (config.computeManaBase) {
+        if (config.computeDevotion) {
-                auto mana = determineManaProduction(info->getText());
+            auto devo = countManaSymbols(card.getInfo().getManaCost());
-                for (auto it = mana.begin(); it != mana.end(); ++it)
+            for (auto &d : devo)
-                    manaBaseMap[it.key()] += it.value();
+                manaDevotionMap[d.first] += d.second;
-            }
-
-            // ---- Devotion ----
-            if (config.computeDevotion) {
-                auto devo = countManaSymbols(info->getManaCost());
-                for (auto &d : devo)
-                    manaDevotionMap[d.first] += d.second;
-            }
         }
     }
 

cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp

@@ -224,14 +224,10 @@ QMap<QString, int> DlgSelectSetForCards::getSetsForCards()
     if (!model)
         return setCounts;
 
-    DeckList *decklist = model->getDeckList();
+    QList<QString> cardNames = model->getCardNames();
-    if (!decklist)
-        return setCounts;
 
-    QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
+    for (auto cardName : cardNames) {
-
+        CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(cardName);
-    for (auto currentCard : cardsInDeck) {
-        CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
         if (!infoPtr)
             continue;
 
@@ -267,19 +263,15 @@ void DlgSelectSetForCards::updateCardLists()
         }
     }
 
-    DeckList *decklist = model->getDeckList();
+    QList<QString> cardNames = model->getCardNames();
-    if (!decklist)
-        return;
 
-    QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
+    for (auto cardName : cardNames) {
-
-    for (auto currentCard : cardsInDeck) {
         bool found = false;
         QString foundSetName;
 
         // Check across all sets if the card is present
         for (auto it = selectedCardsBySet.begin(); it != selectedCardsBySet.end(); ++it) {
-            if (it.value().contains(currentCard->getName())) {
+            if (it.value().contains(cardName)) {
                 found = true;
                 foundSetName = it.key(); // Store the set name where it was found
                 break;                   // Stop at the first match
@@ -288,16 +280,16 @@ void DlgSelectSetForCards::updateCardLists()
 
         if (!found) {
             // The card was not in any selected set
-            ExactCard card = CardDatabaseManager::query()->getCard({currentCard->getName()});
+            ExactCard card = CardDatabaseManager::query()->getCard({cardName});
             CardInfoPictureWidget *picture_widget = new CardInfoPictureWidget(uneditedCardsFlowWidget);
             picture_widget->setCard(card);
             uneditedCardsFlowWidget->addWidget(picture_widget);
         } else {
-            ExactCard card = CardDatabaseManager::query()->getCard(
+            ExactCard card =
-                {currentCard->getName(), CardDatabaseManager::getInstance()
+                CardDatabaseManager::query()->getCard({cardName, CardDatabaseManager::getInstance()
-                                             ->query()
+                                                                     ->query()
-                                             ->getSpecificPrinting(currentCard->getName(), foundSetName, "")
+                                                                     ->getSpecificPrinting(cardName, foundSetName, "")
-                                             .getUuid()});
+                                                                     .getUuid()});
             CardInfoPictureWidget *picture_widget = new CardInfoPictureWidget(modifiedCardsFlowWidget);
             picture_widget->setCard(card);
             modifiedCardsFlowWidget->addWidget(picture_widget);
@@ -356,20 +348,16 @@ QMap<QString, QStringList> DlgSelectSetForCards::getCardsForSets()
     if (!model)
         return setCards;
 
-    DeckList *decklist = model->getDeckList();
+    QList<QString> cardNames = model->getCardNames();
-    if (!decklist)
-        return setCards;
 
-    QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
+    for (auto cardName : cardNames) {
-
+        CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(cardName);
-    for (auto currentCard : cardsInDeck) {
-        CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
         if (!infoPtr)
             continue;
 
         SetToPrintingsMap setMap = infoPtr->getSets();
         for (auto it = setMap.begin(); it != setMap.end(); ++it) {
-            setCards[it.key()].append(currentCard->getName());
+            setCards[it.key()].append(cardName);
         }
     }
 

cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp

@@ -306,19 +306,12 @@ int CardAmountWidget::countCardsInZone(const QString &deckZone)
         return -1;
     }
 
-    DeckList *decklist = deckModel->getDeckList();
+    QList<ExactCard> cards = deckModel->getCardsForZone(deckZone);
-    if (!decklist) {
-        return -1;
-    }
-
-    QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes({deckZone});
 
     int count = 0;
-    for (auto currentCard : cardsInDeck) {
+    for (auto currentCard : cards) {
-        for (int k = 0; k < currentCard->getNumber(); ++k) {
+        if (currentCard.getPrinting().getUuid() == rootCard.getPrinting().getProperty("uuid")) {
-            if (currentCard->getCardProviderId() == rootCard.getPrinting().getProperty("uuid")) {
+            count++;
-                count++;
-            }
         }
     }
 

cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp

@@ -64,14 +64,10 @@ void VisualDatabaseDisplayNameFilterWidget::actLoadFromDeck()
 
     if (!deckListModel)
         return;
-    DeckList *decklist = deckListModel->getDeckList();
-    if (!decklist)
-        return;
 
-    QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
+    QList<QString> cardNames = deckListModel->getCardNames();
-
+    for (auto cardName : cardNames) {
-    for (auto currentCard : cardsInDeck) {
+        createNameFilter(cardName);
-        createNameFilter(currentCard->getName());
     }
 
     updateFilterModel();

cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp

@@ -76,25 +76,11 @@ void VisualDeckEditorSampleHandWidget::updateDisplay()
 
 QList<ExactCard> VisualDeckEditorSampleHandWidget::getRandomCards(int amountToGet)
 {
-    QList<ExactCard> mainDeckCards;
     QList<ExactCard> randomCards;
     if (!deckListModel)
         return randomCards;
-    DeckList *decklist = deckListModel->getDeckList();
-    if (!decklist)
-        return randomCards;
 
-    QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes({DECK_ZONE_MAIN});
+    QList<ExactCard> mainDeckCards = deckListModel->getCardsForZone(DECK_ZONE_MAIN);
-
-    // Collect all cards in the main deck, allowing duplicates based on their count
-    for (auto currentCard : cardsInDeck) {
-        for (int k = 0; k < currentCard->getNumber(); ++k) {
-            ExactCard card = CardDatabaseManager::query()->getCard(currentCard->toCardRef());
-            if (card) {
-                mainDeckCards.append(card);
-            }
-        }
-    }
 
     if (mainDeckCards.isEmpty())
         return randomCards;

libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp

@@ -599,6 +599,16 @@ QList<ExactCard> DeckListModel::getCardsForZone(const QString &zoneName) const
     return cards;
 }
 
+QList<QString> DeckListModel::getCardNames() const
+{
+    auto nodes = deckList->getCardNodes();
+
+    QList<QString> names;
+    std::transform(nodes.cbegin(), nodes.cend(), std::back_inserter(names), [](auto node) { return node->getName(); });
+
+    return names;
+}
+
 QList<QString> DeckListModel::getZones() const
 {
     auto zoneNodes = deckList->getZoneNodes();
@@ -632,7 +642,6 @@ int maxAllowedForLegality(const FormatRules &format, const QString &legality)
     return -1; // unknown legality → treat as illegal
 }
 
-
 bool DeckListModel::isCardQuantityLegalForCurrentFormat(const CardInfoPtr cardInfo, int quantity)
 {
     auto formatRules = CardDatabaseManager::query()->getFormat(deckList->getGameFormat());

libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h

@@ -311,6 +311,7 @@ public:
 
     [[nodiscard]] QList<ExactCard> getCards() const;
     [[nodiscard]] QList<ExactCard> getCardsForZone(const QString &zoneName) const;
+    [[nodiscard]] QList<QString> getCardNames() const;
     [[nodiscard]] QList<QString> getZones() const;
     bool isCardLegalForCurrentFormat(CardInfoPtr cardInfo);
     bool isCardQuantityLegalForCurrentFormat(CardInfoPtr cardInfo, int quantity);