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 8f5f875b1..ac3bf70e4 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 @@ -393,11 +393,6 @@ void DeckEditorDeckDockWidget::setDeck(DeckLoader *_deck) emit deckChanged(); } -DeckList *DeckEditorDeckDockWidget::getDeckList() -{ - return deckModel->getDeckList(); -} - DeckLoader *DeckEditorDeckDockWidget::getDeckLoader() { return deckLoader; diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h index b2e45e186..3c53d508f 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_deck_dock_widget.h @@ -51,7 +51,6 @@ public slots: void cleanDeck(); void updateBannerCardComboBox(); void setDeck(DeckLoader *_deck); - DeckList *getDeckList(); DeckLoader *getDeckLoader(); void actIncrement(); bool swapCard(const QModelIndex &idx); diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp index 820847a7b..4fbe4a1c1 100644 --- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp +++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.cpp @@ -209,7 +209,7 @@ void AbstractTabDeckEditor::openDeck(DeckLoader *deck) void AbstractTabDeckEditor::setDeck(DeckLoader *_deck) { deckDockWidget->setDeck(_deck); - CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(getDeckList()->getCardRefList())); + CardPictureLoader::cacheCardPixmaps(CardDatabaseManager::query()->getCards(getDeckLoader()->getCardRefList())); setModified(false); aDeckDockVisible->setChecked(true); @@ -217,11 +217,6 @@ void AbstractTabDeckEditor::setDeck(DeckLoader *_deck) } /** @brief Returns the currently loaded deck. */ -DeckList *AbstractTabDeckEditor::getDeckList() const -{ - return deckDockWidget->getDeckList(); -} - DeckLoader *AbstractTabDeckEditor::getDeckLoader() const { return deckDockWidget->getDeckLoader(); @@ -423,7 +418,7 @@ bool AbstractTabDeckEditor::actSaveDeckAs() dialog.setAcceptMode(QFileDialog::AcceptSave); dialog.setDefaultSuffix("cod"); dialog.setNameFilters(DeckLoader::FILE_NAME_FILTERS); - dialog.selectFile(getDeckList()->getName().trimmed()); + dialog.selectFile(getDeckLoader()->getName().trimmed()); if (!dialog.exec()) return false; @@ -605,14 +600,14 @@ void AbstractTabDeckEditor::actExportDeckDecklistXyz() void AbstractTabDeckEditor::actAnalyzeDeckDeckstats() { auto *interface = new DeckStatsInterface(*databaseDisplayDockWidget->databaseModel->getDatabase(), this); - interface->analyzeDeck(getDeckList()); + interface->analyzeDeck(getDeckLoader()); } /** @brief Analyzes the deck using TappedOut. */ void AbstractTabDeckEditor::actAnalyzeDeckTappedout() { auto *interface = new TappedOutInterface(*databaseDisplayDockWidget->databaseModel->getDatabase(), this); - interface->analyzeDeck(getDeckList()); + interface->analyzeDeck(getDeckLoader()); } /** @brief Applies a new filter tree to the database display. */ diff --git a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h index eb7981b9c..3716566d0 100644 --- a/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h +++ b/cockatrice/src/interface/widgets/tabs/abstract_tab_deck_editor.h @@ -117,7 +117,6 @@ public: void openDeck(DeckLoader *deck); /** @brief Returns the currently active deck. */ - DeckList *getDeckList() const; DeckLoader *getDeckLoader() const; /** @brief Sets the modified state of the tab.