diff --git a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp index fb686db9b..205b2182e 100644 --- a/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp +++ b/cockatrice/src/client/ui/widgets/visual_deck_editor/visual_deck_editor_widget.cpp @@ -204,9 +204,9 @@ void VisualDeckEditorWidget::populateCards() if (!deckListModel) return; - DeckList *decklist = deckListModel->getDeckList(); - mainDeckCards = decklist->getCardsAsCardInfoPtrsForZone(DECK_ZONE_MAIN); - sideboardCards = decklist->getCardsAsCardInfoPtrsForZone(DECK_ZONE_SIDE); + + mainDeckCards = deckListModel->getCardsAsCardInfoPtrsForZone(DECK_ZONE_MAIN); + sideboardCards = deckListModel->getCardsAsCardInfoPtrsForZone(DECK_ZONE_SIDE); } void VisualDeckEditorWidget::sortCardList(const QStringList properties, Qt::SortOrder order = Qt::AscendingOrder) diff --git a/common/decklist.cpp b/common/decklist.cpp index 69ffff685..789f57910 100644 --- a/common/decklist.cpp +++ b/common/decklist.cpp @@ -1,7 +1,5 @@ #include "decklist.h" -#include "../cockatrice/src/game/cards/card_database_manager.h" - #include #include #include @@ -866,66 +864,6 @@ QMap DeckList::getCardListWithProviderId() const return result; } -QList *DeckList::getCardsAsCardInfoPtrs() const -{ - QList *cards = new QList(); - InnerDecklistNode *listRoot = getRoot(); - if (!listRoot) - return cards; - - for (int i = 0; i < listRoot->size(); i++) { - InnerDecklistNode *currentZone = dynamic_cast(listRoot->at(i)); - if (!currentZone) - continue; - for (int j = 0; j < currentZone->size(); j++) { - DecklistCardNode *currentCard = dynamic_cast(currentZone->at(j)); - if (!currentCard) - continue; - for (int k = 0; k < currentCard->getNumber(); ++k) { - CardInfoPtr info = CardDatabaseManager::getInstance()->getCardByNameAndProviderId( - currentCard->getName(), currentCard->getCardProviderId()); - if (info) { - cards->append(info); - } else { - qDebug() << "Card not found in database!"; - } - } - } - } - return cards; -} - -QList *DeckList::getCardsAsCardInfoPtrsForZone(QString zoneName) const -{ - QList *cards = new QList(); - InnerDecklistNode *listRoot = getRoot(); - if (!listRoot) - return cards; - - for (int i = 0; i < listRoot->size(); i++) { - InnerDecklistNode *currentZone = dynamic_cast(listRoot->at(i)); - if (!currentZone) - continue; - if (currentZone->getName() == zoneName) { - for (int j = 0; j < currentZone->size(); j++) { - DecklistCardNode *currentCard = dynamic_cast(currentZone->at(j)); - if (!currentCard) - continue; - for (int k = 0; k < currentCard->getNumber(); ++k) { - CardInfoPtr info = CardDatabaseManager::getInstance()->getCardByNameAndProviderId( - currentCard->getName(), currentCard->getCardProviderId()); - if (info) { - cards->append(info); - } else { - qDebug() << "Card not found in database!"; - } - } - } - } - } - return cards; -} - int DeckList::getSideboardSize() const { int size = 0; diff --git a/common/decklist.h b/common/decklist.h index ace6ed7d1..89067b226 100644 --- a/common/decklist.h +++ b/common/decklist.h @@ -366,8 +366,6 @@ public: } QStringList getCardList() const; QMap getCardListWithProviderId() const; - QList *getCardsAsCardInfoPtrs() const; - QList *getCardsAsCardInfoPtrsForZone(QString zoneName) const; int getSideboardSize() const;