From 5ef220d5f28eb0efd4585fb3964f108111dedb6e Mon Sep 17 00:00:00 2001 From: Phoenix Osiris Date: Wed, 17 Jul 2013 17:21:00 -0400 Subject: [PATCH] Adding Set Code To Filtering Method Updating Tab To Include Set Param --- cockatrice/src/carddatabasemodel.h | 2 +- cockatrice/src/tab_deck_editor.cpp | 10 +++++----- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/cockatrice/src/carddatabasemodel.h b/cockatrice/src/carddatabasemodel.h index ae31a7690..813f570cc 100644 --- a/cockatrice/src/carddatabasemodel.h +++ b/cockatrice/src/carddatabasemodel.h @@ -35,7 +35,7 @@ public: private: FilterBool isToken; QString cardNameBeginning, cardName, cardText, cardSet; - QSet cardNameSet, cardTypes, cardColors; + QSet cardNameSet, cardTypes, cardColors; public: CardDatabaseDisplayModel(QObject *parent = 0); void setIsToken(FilterBool _isToken) { isToken = _isToken; invalidate(); } diff --git a/cockatrice/src/tab_deck_editor.cpp b/cockatrice/src/tab_deck_editor.cpp index 32b2035dd..572bac6e4 100644 --- a/cockatrice/src/tab_deck_editor.cpp +++ b/cockatrice/src/tab_deck_editor.cpp @@ -499,11 +499,11 @@ void TabDeckEditor::actEditTokens() void TabDeckEditor::actSearch() { - if (dlgCardSearch->exec()) { - searchEdit->clear(); - databaseDisplayModel->setCardName(dlgCardSearch->getCardName()); - databaseDisplayModel->setCardText(dlgCardSearch->getCardText()); - databaseDisplayModel->setCardTypes(dlgCardSearch->getCardTypes()); + if (dlgCardSearch->exec()) { + searchEdit->clear(); + databaseDisplayModel->setCardName(dlgCardSearch->getCardName()); + databaseDisplayModel->setCardText(dlgCardSearch->getCardText()); + databaseDisplayModel->setCardTypes(dlgCardSearch->getCardTypes()); databaseDisplayModel->setCardColors(dlgCardSearch->getCardColors()); databaseDisplayModel->setCardSet(dlgCardSearch->getCardSet()); }