jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-09 09:33:57 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

make node getter return const lists

Browse source
This commit is contained in:
RickyRister 2025-12-07 22:24:44 -08:00
parent 1f30e8cfc8
commit 762dd8d85a
10 changed files with 17 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/interface/deck_loader/deck_loader.cpp
View file

@ -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 * Converts all cards in the list to their decklist export string and joins them into one string
*/ */
static QString toDecklistExportString(const QList<DecklistCardNode *> &cardNodes) static QString toDecklistExportString(const QList<const DecklistCardNode *> &cardNodes)
{ {
QString cardsString; QString cardsString;
for (auto card : cardNodes) { for (auto card : cardNodes) {
@ -511,7 +511,7 @@ QString DeckLoader::getCompleteCardName(const QString &cardName)
return cardName; return cardName;
} }
void DeckLoader::printDeckListNode(QTextCursor *cursor, InnerDecklistNode *node) void DeckLoader::printDeckListNode(QTextCursor *cursor, const InnerDecklistNode *node)
{ {
const int totalColumns = 2; const int totalColumns = 2;

2
cockatrice/src/interface/deck_loader/deck_loader.h
View file

@ -94,7 +94,7 @@ public:
} }
private: 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_DeckHeader(QTextStream &out, const DeckList *deckList);
static void saveToStream_DeckZone(QTextStream &out, static void saveToStream_DeckZone(QTextStream &out,

2
cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
View file

@ -337,7 +337,7 @@ void DeckEditorDeckDockWidget::updateBannerCardComboBox()
// Collect unique (name, providerId) pairs // Collect unique (name, providerId) pairs
QSet<QPair<QString, QString>> bannerCardSet; QSet<QPair<QString, QString>> bannerCardSet;
QList<DecklistCardNode *> cardsInDeck = deckModel->getDeckList()->getCardNodes(); QList<const DecklistCardNode *> cardsInDeck = deckModel->getDeckList()->getCardNodes();
for (auto currentCard : cardsInDeck) { for (auto currentCard : cardsInDeck) {
if (!CardDatabaseManager::query()->getCard(currentCard->toCardRef())) { if (!CardDatabaseManager::query()->getCard(currentCard->toCardRef())) {

6
cockatrice/src/interface/widgets/dialogs/dlg_select_set_for_cards.cpp
View file

@ -228,7 +228,7 @@ QMap<QString, int> DlgSelectSetForCards::getSetsForCards()
if (!decklist) if (!decklist)
return setCounts; return setCounts;
QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes(); QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
for (auto currentCard : cardsInDeck) { for (auto currentCard : cardsInDeck) {
CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName()); CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName());
@ -271,7 +271,7 @@ void DlgSelectSetForCards::updateCardLists()
if (!decklist) if (!decklist)
return; return;
QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes(); QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
for (auto currentCard : cardsInDeck) { for (auto currentCard : cardsInDeck) {
bool found = false; bool found = false;
@ -360,7 +360,7 @@ QMap<QString, QStringList> DlgSelectSetForCards::getCardsForSets()
if (!decklist) if (!decklist)
return setCards; return setCards;
QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes(); QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
for (auto currentCard : cardsInDeck) { for (auto currentCard : cardsInDeck) {
CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName()); CardInfoPtr infoPtr = CardDatabaseManager::query()->getCardInfo(currentCard->getName());

2
cockatrice/src/interface/widgets/printing_selector/card_amount_widget.cpp
View file

@ -311,7 +311,7 @@ int CardAmountWidget::countCardsInZone(const QString &deckZone)
return -1; return -1;
} }
QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes({deckZone}); QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes({deckZone});
int count = 0; int count = 0;
for (auto currentCard : cardsInDeck) { for (auto currentCard : cardsInDeck) {

2
cockatrice/src/interface/widgets/visual_database_display/visual_database_display_name_filter_widget.cpp
View file

@ -68,7 +68,7 @@ void VisualDatabaseDisplayNameFilterWidget::actLoadFromDeck()
if (!decklist) if (!decklist)
return; return;
QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes(); QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes();
for (auto currentCard : cardsInDeck) { for (auto currentCard : cardsInDeck) {
createNameFilter(currentCard->getName()); createNameFilter(currentCard->getName());

2
cockatrice/src/interface/widgets/visual_deck_editor/visual_deck_editor_sample_hand_widget.cpp
View file

@ -84,7 +84,7 @@ QList<ExactCard> VisualDeckEditorSampleHandWidget::getRandomCards(int amountToGe
if (!decklist) if (!decklist)
return randomCards; return randomCards;
QList<DecklistCardNode *> cardsInDeck = decklist->getCardNodes({DECK_ZONE_MAIN}); QList<const DecklistCardNode *> cardsInDeck = decklist->getCardNodes({DECK_ZONE_MAIN});
// Collect all cards in the main deck, allowing duplicates based on their count // Collect all cards in the main deck, allowing duplicates based on their count
for (auto currentCard : cardsInDeck) { for (auto currentCard : cardsInDeck) {

2
cockatrice/src/interface/widgets/visual_deck_storage/deck_preview/deck_preview_widget.cpp
View file

@ -235,7 +235,7 @@ void DeckPreviewWidget::updateBannerCardComboBox()
// Prepare the new items with deduplication // Prepare the new items with deduplication
QSet<QPair<QString, QString>> bannerCardSet; QSet<QPair<QString, QString>> bannerCardSet;
QList<DecklistCardNode *> cardsInDeck = deckLoader->getDeckList()->getCardNodes(); QList<const DecklistCardNode *> cardsInDeck = deckLoader->getDeckList()->getCardNodes();
for (auto currentCard : cardsInDeck) { for (auto currentCard : cardsInDeck) {
for (int k = 0; k < currentCard->getNumber(); ++k) { for (int k = 0; k < currentCard->getNumber(); ++k) {

8
libcockatrice_deck_list/libcockatrice/deck_list/deck_list.cpp
View file

@ -544,9 +544,9 @@ QList<CardRef> DeckList::getCardRefList() const
return result; return result;
} }
QList<DecklistCardNode *> DeckList::getCardNodes(const QStringList &restrictToZones) const QList<const DecklistCardNode *> DeckList::getCardNodes(const QStringList &restrictToZones) const
{ {
QList<DecklistCardNode *> result; QList<const DecklistCardNode *> result;
auto zoneNodes = getZoneNodes(); auto zoneNodes = getZoneNodes();
for (auto *zoneNode : zoneNodes) { for (auto *zoneNode : zoneNodes) {
@ -564,9 +564,9 @@ QList<DecklistCardNode *> DeckList::getCardNodes(const QStringList &restrictToZo
return result; return result;
} }
QList<InnerDecklistNode *> DeckList::getZoneNodes() const QList<const InnerDecklistNode *> DeckList::getZoneNodes() const
{ {
QList<InnerDecklistNode *> zones; QList<const InnerDecklistNode *> zones;
for (auto *node : *root) { for (auto *node : *root) {
InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(node); InnerDecklistNode *currentZone = dynamic_cast<InnerDecklistNode *>(node);
if (!currentZone) if (!currentZone)

4
libcockatrice_deck_list/libcockatrice/deck_list/deck_list.h
View file

@ -265,8 +265,8 @@ public:
} }
QStringList getCardList() const; QStringList getCardList() const;
QList<CardRef> getCardRefList() const; QList<CardRef> getCardRefList() const;
QList<DecklistCardNode *> getCardNodes(const QStringList &restrictToZones = QStringList()) const; QList<const DecklistCardNode *> getCardNodes(const QStringList &restrictToZones = QStringList()) const;
QList<InnerDecklistNode *> getZoneNodes() const; QList<const InnerDecklistNode *> getZoneNodes() const;
int getSideboardSize() const; int getSideboardSize() const;
InnerDecklistNode *getRoot() const InnerDecklistNode *getRoot() const
{ {