From 762dd8d85a91686aa22b9170a14e59c40759485a Mon Sep 17 00:00:00 2001 From: RickyRister Date: Sun, 7 Dec 2025 22:24:44 -0800 Subject: [PATCH] make node getter return const lists --- cockatrice/src/interface/deck_loader/deck_loader.cpp | 4 ++-- cockatrice/src/interface/deck_loader/deck_loader.h | 2 +- .../widgets/deck_editor/deck_editor_deck_dock_widget.cpp | 2 +- .../widgets/dialogs/dlg_select_set_for_cards.cpp | 6 +++--- .../widgets/printing_selector/card_amount_widget.cpp | 2 +- .../visual_database_display_name_filter_widget.cpp | 2 +- .../visual_deck_editor_sample_hand_widget.cpp | 2 +- .../deck_preview/deck_preview_widget.cpp | 2 +- .../libcockatrice/deck_list/deck_list.cpp | 8 ++++---- .../libcockatrice/deck_list/deck_list.h | 4 ++-- 10 files changed, 17 insertions(+), 17 deletions(-) diff --git a/cockatrice/src/interface/deck_loader/deck_loader.cpp b/cockatrice/src/interface/deck_loader/deck_loader.cpp index de07a0199..e7674e085 100644 --- a/cockatrice/src/interface/deck_loader/deck_loader.cpp +++ b/cockatrice/src/interface/deck_loader/deck_loader.cpp @@ -272,7 +272,7 @@ static QString toDecklistExportString(const DecklistCardNode *card) /** * Converts all cards in the list to their decklist export string and joins them into one string */ -static QString toDecklistExportString(const QList &cardNodes) +static QString toDecklistExportString(const QList &cardNodes) { QString cardsString; for (auto card : cardNodes) { @@ -511,7 +511,7 @@ QString DeckLoader::getCompleteCardName(const QString &cardName) return cardName; } -void DeckLoader::printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node) +void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode *node) { const int totalColumns = 2; diff --git a/cockatrice/src/interface/deck_loader/deck_loader.h b/cockatrice/src/interface/deck_loader/deck_loader.h index 474eee149..ae3088ff8 100644 --- a/cockatrice/src/interface/deck_loader/deck_loader.h +++ b/cockatrice/src/interface/deck_loader/deck_loader.h @@ -94,7 +94,7 @@ public: } private: - static void printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node); + static void printDeckListNode(QTextCursor *cursor, const InnerDecklistNode *node); static void saveToStream_DeckHeader(QTextStream &out, const DeckList *deckList); static void saveToStream_DeckZone(QTextStream &out, diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp index 7e4287ac5..08ebf23ba 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp @@ -337,7 +337,7 @@ void DeckEditorDeckDockWidget::updateBannerCardComboBox() // Collect unique (name, providerId) pairs QSet> bannerCardSet; - QList cardsInDeck = deckModel->getDeckList()->getCardNodes(); + QList cardsInDeck = deckModel->getDeckList()->getCardNodes(); for (auto currentCard : cardsInDeck) { if (!CardDatabaseManager::query()->getCard(currentCard->toCardRef())) { diff --git a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp index 5b6eff923..2bfe650c3 100644 --- a/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp +++ b/cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp @@ -228,7 +228,7 @@ QMap DlgSelectSetForCards::getSetsForCards() if (!decklist) return setCounts; - QList cardsInDeck = decklist->getCardNodes(); + QList cardsInDeck = decklist->getCardNodes(); for (auto currentCard : cardsInDeck) { CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName()); @@ -271,7 +271,7 @@ void DlgSelectSetForCards::updateCardLists() if (!decklist) return; - QList cardsInDeck = decklist->getCardNodes(); + QList cardsInDeck = decklist->getCardNodes(); for (auto currentCard : cardsInDeck) { bool found = false; @@ -360,7 +360,7 @@ QMap DlgSelectSetForCards::getCardsForSets() if (!decklist) return setCards; - QList cardsInDeck = decklist->getCardNodes(); + QList cardsInDeck = decklist->getCardNodes(); for (auto currentCard : cardsInDeck) { CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName()); diff --git a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp index 80258be61..0d0195d34 100644 --- a/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp +++ b/cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp @@ -311,7 +311,7 @@ int CardAmountWidget::countCardsInZone(const QString &deckZone) return -1; } - QList cardsInDeck = decklist->getCardNodes({deckZone}); + QList cardsInDeck = decklist->getCardNodes({deckZone}); int count = 0; for (auto currentCard : cardsInDeck) { diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp index 64eed8b16..f09578ac9 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp @@ -68,7 +68,7 @@ void VisualDatabaseDisplayNameFilterWidget::actLoadFromDeck() if (!decklist) return; - QList cardsInDeck = decklist->getCardNodes(); + QList cardsInDeck = decklist->getCardNodes(); for (auto currentCard : cardsInDeck) { createNameFilter(currentCard->getName()); diff --git a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp index b1db1cf37..341b94a3b 100644 --- a/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp @@ -84,7 +84,7 @@ QList VisualDeckEditorSampleHandWidget::getRandomCards(int amountToGe if (!decklist) return randomCards; - QList cardsInDeck = decklist->getCardNodes({DECK_ZONE_MAIN}); + QList cardsInDeck = decklist->getCardNodes({DECK_ZONE_MAIN}); // Collect all cards in the main deck, allowing duplicates based on their count for (auto currentCard : cardsInDeck) { diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp index 1db0feb63..68243100c 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp @@ -235,7 +235,7 @@ void DeckPreviewWidget::updateBannerCardComboBox() // Prepare the new items with deduplication QSet> bannerCardSet; - QList cardsInDeck = deckLoader->getDeckList()->getCardNodes(); + QList cardsInDeck = deckLoader->getDeckList()->getCardNodes(); for (auto currentCard : cardsInDeck) { for (int k = 0; k < currentCard->getNumber(); ++k) { diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp index bbe670528..40fe03b41 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp @@ -544,9 +544,9 @@ QList DeckList::getCardRefList() const return result; } -QList DeckList::getCardNodes(const QStringList &restrictToZones) const +QList DeckList::getCardNodes(const QStringList &restrictToZones) const { - QList result; + QList result; auto zoneNodes = getZoneNodes(); for (auto *zoneNode : zoneNodes) { @@ -564,9 +564,9 @@ QList DeckList::getCardNodes(const QStringList &restrictToZo return result; } -QList DeckList::getZoneNodes() const +QList DeckList::getZoneNodes() const { - QList zones; + QList zones; for (auto *node : *root) { InnerDecklistNode *currentZone = dynamic_cast(node); if (!currentZone) diff --git a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h index f4d789b3d..6f90b6b14 100644 --- a/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h +++ b/libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h @@ -265,8 +265,8 @@ public: } QStringList getCardList() const; QList getCardRefList() const; - QList getCardNodes(const QStringList &restrictToZones = QStringList()) const; - QList getZoneNodes() const; + QList getCardNodes(const QStringList &restrictToZones = QStringList()) const; + QList getZoneNodes() const; int getSideboardSize() const; InnerDecklistNode *getRoot() const {