replace direct calls to getRoot and forEachCard

cockatrice/src/filters/deck_filter_string.cpp

@@ -118,12 +118,13 @@ static void setupParserRules()
 
         return [=](const DeckPreviewWidget *deck, const ExtraDeckSearchInfo &) -> bool {
             int count = 0;
-            deck->deckLoader->getDeckList()->forEachCard([&](InnerDecklistNode *, const DecklistCardNode *node) {
+            auto cardNodes = deck->deckLoader->getDeckList()->getCardNodes();
+            for (auto node : cardNodes) {
                 auto cardInfoPtr = CardDatabaseManager::query()->getCardInfo(node->getName());
                 if (!cardInfoPtr.isNull() && cardFilter.check(cardInfoPtr)) {
                     count += node->getNumber();
                 }
-            });
+            }
             return numberMatcher(count);
         };
     };

cockatrice/src/game/player/menu/utility_menu.cpp

@@ -5,6 +5,7 @@
 #include "../player_actions.h"
 #include "player_menu.h"
 
+#include <libcockatrice/deck_list/tree/deck_list_card_node.h>
 #include <libcockatrice/deck_list/tree/inner_deck_list_node.h>
 
 UtilityMenu::UtilityMenu(Player *_player, QMenu *playerMenu) : QMenu(playerMenu), player(_player)
@@ -65,15 +66,13 @@ void UtilityMenu::populatePredefinedTokensMenu()
         return;
     }
 
-    InnerDecklistNode *tokenZone =
+    auto tokenCardNodes = _deck->getDeckList()->getCardNodes({DECK_ZONE_TOKENS});
-        dynamic_cast<InnerDecklistNode *>(_deck->getDeckList()->getRoot()->findChild(DECK_ZONE_TOKENS));
 
-    if (tokenZone) {
+    if (!tokenCardNodes.isEmpty()) {
-        if (!tokenZone->empty())
+        setEnabled(true);
-            setEnabled(true);
 
-        for (int i = 0; i < tokenZone->size(); ++i) {
+        for (int i = 0; i < tokenCardNodes.size(); ++i) {
-            const QString tokenName = tokenZone->at(i)->getName();
+            const QString tokenName = tokenCardNodes[i]->getName();
             predefinedTokens.append(tokenName);
             QAction *a = addAction(tokenName);
             if (i < 10) {

cockatrice/src/interface/deck_loader/deck_loader.cpp

@@ -335,9 +335,7 @@ bool DeckLoader::saveToStream_Plain(QTextStream &out,
     }
 
     // loop zones
-    for (int i = 0; i < deckList->getRoot()->size(); i++) {
+    for (auto zoneNode : deckList->getZoneNodes()) {
-        const auto *zoneNode = dynamic_cast<InnerDecklistNode *>(deckList->getRoot()->at(i));
-
         saveToStream_DeckZone(out, zoneNode, addComments, addSetNameAndNumber);
 
         // end of zone
@@ -597,12 +595,11 @@ void DeckLoader::printDeckList(QPrinter *printer, const DeckList *deckList)
     cursor.insertText(deckList->getComments());
     cursor.insertBlock(headerBlockFormat, headerCharFormat);
 
-    for (int i = 0; i < deckList->getRoot()->size(); i++) {
+    for (auto zoneNode : deckList->getZoneNodes()) {
         cursor.insertHtml("<br><img src=theme:hr.jpg>");
-        // cursor.insertHtml("<hr>");
         cursor.insertBlock(headerBlockFormat, headerCharFormat);
 
-        printDeckListNode(&cursor, dynamic_cast<InnerDecklistNode *>(deckList->getRoot()->at(i)));
+        printDeckListNode(&cursor, zoneNode);
     }
 
     doc.print(printer);

libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp

@@ -579,18 +579,13 @@ QList<InnerDecklistNode *> DeckList::getZoneNodes() const
 
 int DeckList::getSideboardSize() const
 {
-    int size = 0;
+    auto cards = getCardNodes({DECK_ZONE_SIDE});
-    for (int i = 0; i < root->size(); ++i) {
-        auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
-        if (node->getName() != DECK_ZONE_SIDE) {
-            continue;
-        }
 
-        for (int j = 0; j < node->size(); j++) {
+    int size = 0;
-            auto *card = dynamic_cast<DecklistCardNode *>(node->at(j));
+    for (auto card : cards) {
-            size += card->getNumber();
+        size += card->getNumber();
-        }
     }
+
     return size;
 }
 
@@ -656,26 +651,18 @@ bool DeckList::deleteNode(AbstractDecklistNode *node, InnerDecklistNode *rootNod
     return false;
 }
 
-static QString computeDeckHash(const InnerDecklistNode *root)
+static QString computeDeckHash(const DeckList &deckList)
 {
+    auto mainDeckNodes = deckList.getCardNodes({DECK_ZONE_MAIN});
+    auto sideDeckNodes = deckList.getCardNodes({DECK_ZONE_SIDE});
+
     QStringList cardList;
-    QSet<QString> hashZones, optionalZones;
 
-    hashZones << DECK_ZONE_MAIN << DECK_ZONE_SIDE; // Zones in deck to be included in hashing process
+    std::transform(mainDeckNodes.cbegin(), mainDeckNodes.cend(), std::back_inserter(cardList),
-    optionalZones << DECK_ZONE_TOKENS;             // Optional zones in deck not included in hashing process
+                   [](auto node) { return node->getName().toLower(); });
+    std::transform(sideDeckNodes.cbegin(), sideDeckNodes.cend(), std::back_inserter(cardList),
+                   [](auto node) { return "SB:" + node->getName().toLower(); });
 
-    for (int i = 0; i < root->size(); i++) {
-        auto *node = dynamic_cast<InnerDecklistNode *>(root->at(i));
-        for (int j = 0; j < node->size(); j++) {
-            if (hashZones.contains(node->getName())) // Mainboard or Sideboard
-            {
-                auto *card = dynamic_cast<DecklistCardNode *>(node->at(j));
-                for (int k = 0; k < card->getNumber(); ++k) {
-                    cardList.append((node->getName() == DECK_ZONE_SIDE ? "SB:" : "") + card->getName().toLower());
-                }
-            }
-        }
-    }
     cardList.sort();
     QByteArray deckHashArray = QCryptographicHash::hash(cardList.join(";").toUtf8(), QCryptographicHash::Sha1);
     quint64 number = (((quint64)(unsigned char)deckHashArray[0]) << 32) +
@@ -697,7 +684,7 @@ QString DeckList::getDeckHash() const
         return cachedDeckHash;
     }
 
-    cachedDeckHash = computeDeckHash(root);
+    cachedDeckHash = computeDeckHash(*this);
     return cachedDeckHash;
 }
 

libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp

@@ -550,86 +550,49 @@ void DeckListModel::setDeckList(DeckList *_deck)
 
 QList<ExactCard> DeckListModel::getCards() const
 {
-    QList<ExactCard> cards;
+    auto nodes = deckList->getCardNodes();
-    DeckList *decklist = getDeckList();
-    if (!decklist) {
-        return cards;
-    }
-    InnerDecklistNode *listRoot = decklist->getRoot();
-    if (!listRoot)
-        return cards;
 
-    for (int i = 0; i < listRoot->size(); i++) {
+    QList<ExactCard> cards;
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+    for (auto node : nodes) {
-        if (!currentZone)
+        ExactCard card = CardDatabaseManager::query()->getCard(node->toCardRef());
-            continue;
+        if (card) {
-        for (int j = 0; j < currentZone->size(); j++) {
+            for (int k = 0; k < node->getNumber(); ++k) {
-            DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
+                cards.append(card);
-            if (!currentCard)
-                continue;
-            for (int k = 0; k < currentCard->getNumber(); ++k) {
-                ExactCard card = CardDatabaseManager::query()->getCard(currentCard->toCardRef());
-                if (card) {
-                    cards.append(card);
-                } else {
-                    qDebug() << "Card not found in database!";
-                }
             }
+        } else {
+            qDebug() << "Card not found in database!";
         }
     }
+
     return cards;
 }
 
 QList<ExactCard> DeckListModel::getCardsForZone(const QString &zoneName) const
 {
-    QList<ExactCard> cards;
+    auto nodes = deckList->getCardNodes({zoneName});
-    DeckList *decklist = getDeckList();
-    if (!decklist) {
-        return cards;
-    }
-    InnerDecklistNode *listRoot = decklist->getRoot();
-    if (!listRoot)
-        return cards;
 
-    for (int i = 0; i < listRoot->size(); i++) {
+    QList<ExactCard> cards;
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+    for (auto node : nodes) {
-        if (!currentZone)
+        ExactCard card = CardDatabaseManager::query()->getCard(node->toCardRef());
-            continue;
+        if (card) {
-        if (currentZone->getName() == zoneName) {
+            for (int k = 0; k < node->getNumber(); ++k) {
-            for (int j = 0; j < currentZone->size(); j++) {
+                cards.append(card);
-                DecklistCardNode *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
-                if (!currentCard)
-                    continue;
-                for (int k = 0; k < currentCard->getNumber(); ++k) {
-                    ExactCard card = CardDatabaseManager::query()->getCard(currentCard->toCardRef());
-                    if (card) {
-                        cards.append(card);
-                    } else {
-                        qDebug() << "Card not found in database!";
-                    }
-                }
             }
+        } else {
+            qDebug() << "Card not found in database!";
         }
     }
+
     return cards;
 }
 
-QList<QString> *DeckListModel::getZones() const
+QList<QString> DeckListModel::getZones() const
 {
-    QList<QString> *zones = new QList<QString>();
+    auto zoneNodes = deckList->getZoneNodes();
-    DeckList *decklist = getDeckList();
+
-    if (!decklist) {
+    QList<QString> zones;
-        return zones;
+    std::transform(zoneNodes.cbegin(), zoneNodes.cend(), std::back_inserter(zones),
-    }
+                   [](auto zoneNode) { return zoneNode->getName(); });
-    InnerDecklistNode *listRoot = decklist->getRoot();
-    if (!listRoot)
-        return zones;
 
-    for (int i = 0; i < listRoot->size(); i++) {
-        InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
-        if (!currentZone)
-            continue;
-        zones->append(currentZone->getName());
-    }
     return zones;
 }

libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h

@@ -300,7 +300,7 @@ public:
 
     [[nodiscard]] QList<ExactCard> getCards() const;
     [[nodiscard]] QList<ExactCard> getCardsForZone(const QString &zoneName) const;
-    [[nodiscard]] QList<QString> *getZones() const;
+    [[nodiscard]] QList<QString> getZones() const;
 
     /**
      * @brief Sets the criteria used to group cards in the model.

libcockatrice_network/libcockatrice/network/server/remote/game/server_player.cpp

@@ -102,28 +102,16 @@ void Server_Player::setupZones()
     // ------------------------------------------------------------------
 
     // Assign card ids and create deck from deck list
-    InnerDecklistNode *listRoot = deck->getRoot();
+    auto insertCardsIntoZone = [this](auto cards, auto *zone) {
-    for (int i = 0; i < listRoot->size(); ++i) {
+        for (auto card : cards) {
-        auto *currentZone = dynamic_cast<InnerDecklistNode *>(listRoot->at(i));
+            for (int k = 0; k < card->getNumber(); ++k) {
-        Server_CardZone *z;
+                zone->insertCard(new Server_Card(card->toCardRef(), nextCardId++, 0, 0, zone), -1, 0);
-        if (currentZone->getName() == DECK_ZONE_MAIN) {
+            }
-            z = deckZone;
-        } else if (currentZone->getName() == DECK_ZONE_SIDE) {
-            z = sbZone;
-        } else {
-            continue;
         }
+    };
 
-        for (int j = 0; j < currentZone->size(); ++j) {
+    insertCardsIntoZone(deck->getCardNodes({DECK_ZONE_MAIN}), deckZone);
-            auto *currentCard = dynamic_cast<DecklistCardNode *>(currentZone->at(j));
+    insertCardsIntoZone(deck->getCardNodes({DECK_ZONE_SIDE}), sbZone);
-            if (!currentCard) {
-                continue;
-            }
-            for (int k = 0; k < currentCard->getNumber(); ++k) {
-                z->insertCard(new Server_Card(currentCard->toCardRef(), nextCardId++, 0, 0, z), -1, 0);
-            }
-        }
-    }
 
     const QList<MoveCard_ToZone> &sideboardPlan = deck->getCurrentSideboardPlan();
     for (const auto &m : sideboardPlan) {