From ad8ebde2a13844160b32ae6fde6b5b432c369f02 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 20 Sep 2026 23:53:43 +0200 Subject: [PATCH] [Card] Rename CardSearchLanguage to SearchLanguageMode --- cockatrice/src/filters/deck_filter_string.cpp | 6 ++-- cockatrice/src/filters/deck_filter_string.h | 2 +- .../dialogs/dlg_create_token.cpp | 2 +- .../src/game_graphics/zones/view_zone.cpp | 2 +- .../deck_editor_database_display_widget.cpp | 2 +- .../settings_page/general_settings_page.cpp | 8 ++--- .../widgets/utility/completer_utils.cpp | 2 +- .../visual_database_display_widget.cpp | 2 +- ...l_deck_storage_sort_filter_proxy_model.cpp | 2 +- .../libcockatrice/card/card_localization.h | 2 +- .../libcockatrice/filters/filter_string.cpp | 14 ++++---- .../libcockatrice/filters/filter_string.h | 2 +- .../libcockatrice/filters/filter_tree.cpp | 32 +++++++++---------- .../libcockatrice/filters/filter_tree.h | 20 ++++++------ .../database/card/card_search_model.cpp | 4 +-- .../models/database/card/card_search_model.h | 4 +-- .../database/card_database_display_model.cpp | 4 +-- .../database/card_database_display_model.h | 4 +-- .../settings/cards_display_settings.cpp | 2 +- tests/carddatabase/filter_string_test.cpp | 22 ++++++------- tests/settings/settings_defaults_test.cpp | 6 ++-- 21 files changed, 72 insertions(+), 72 deletions(-) diff --git a/cockatrice/src/filters/deck_filter_string.cpp b/cockatrice/src/filters/deck_filter_string.cpp index 3f4fe9569..b53093500 100644 --- a/cockatrice/src/filters/deck_filter_string.cpp +++ b/cockatrice/src/filters/deck_filter_string.cpp @@ -50,7 +50,7 @@ static std::once_flag init; struct DeckSearchLanguageContext { QString searchLanguage; - CardSearchLanguage searchLanguageMode = CardSearchLanguage::English; + SearchLanguageMode searchLanguageMode = SearchLanguageMode::English; }; thread_local DeckSearchLanguageContext deckSearchLanguageContext; @@ -128,7 +128,7 @@ static void setupParserRules() // actual functionality search["DeckContentQuery"] = [](const peg::SemanticValues &sv) -> DeckFilter { const QString searchLanguage = deckSearchLanguageContext.searchLanguage; - const CardSearchLanguage searchLanguageMode = deckSearchLanguageContext.searchLanguageMode; + const SearchLanguageMode searchLanguageMode = deckSearchLanguageContext.searchLanguageMode; auto cardFilter = FilterString(std::any_cast(sv[0]), searchLanguage, searchLanguageMode); auto numberMatcher = sv.size() > 1 ? std::any_cast(sv[1]) : [](int count) { return count > 0; }; @@ -201,7 +201,7 @@ DeckFilterString::DeckFilterString() DeckFilterString::DeckFilterString(const QString &expr, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) + SearchLanguageMode searchLanguageMode) { QByteArray ba = expr.simplified().toUtf8(); diff --git a/cockatrice/src/filters/deck_filter_string.h b/cockatrice/src/filters/deck_filter_string.h index ef380459c..1189c0db5 100644 --- a/cockatrice/src/filters/deck_filter_string.h +++ b/cockatrice/src/filters/deck_filter_string.h @@ -38,7 +38,7 @@ public: DeckFilterString(); explicit DeckFilterString(const QString &expr, const QString &searchLanguage = QString(), - CardSearchLanguage searchLanguageMode = CardSearchLanguage::English); + SearchLanguageMode searchLanguageMode = SearchLanguageMode::English); bool check(const DeckSearchData &data) const { return filter(data); diff --git a/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp b/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp index 47985cf29..f02de7f53 100644 --- a/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp +++ b/cockatrice/src/game_graphics/dialogs/dlg_create_token.cpp @@ -93,7 +93,7 @@ DlgCreateToken::DlgCreateToken(const QStringList &_predefinedTokens, QWidget *pa CardsDisplaySettings *cardsDisplay = &SettingsCache::instance().cardsDisplay(); const auto applyCardSearchLanguage = [this, cardsDisplay]() { cardDatabaseDisplayModel->setSearchLanguage( - cardsDisplay->getCardLang(), static_cast(cardsDisplay->getCardSearchLanguage())); + cardsDisplay->getCardLang(), static_cast(cardsDisplay->getCardSearchLanguage())); }; applyCardSearchLanguage(); connect(cardsDisplay, &CardsDisplaySettings::cardLangChanged, this, applyCardSearchLanguage); diff --git a/cockatrice/src/game_graphics/zones/view_zone.cpp b/cockatrice/src/game_graphics/zones/view_zone.cpp index c4e781789..a82444821 100644 --- a/cockatrice/src/game_graphics/zones/view_zone.cpp +++ b/cockatrice/src/game_graphics/zones/view_zone.cpp @@ -258,7 +258,7 @@ void ZoneViewZone::setFilterString(const QString &_filterString) { const CardsDisplaySettings &cardsDisplay = SettingsCache::instance().cardsDisplay(); filterString = FilterString(_filterString, cardsDisplay.getCardLang(), - static_cast(cardsDisplay.getCardSearchLanguage())); + static_cast(cardsDisplay.getCardSearchLanguage())); reorganizeCards(); } diff --git a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp index 29c18c821..116cf3498 100644 --- a/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/deck_editor/deck_editor_database_display_widget.cpp @@ -45,7 +45,7 @@ DeckEditorDatabaseDisplayWidget::DeckEditorDatabaseDisplayWidget(QWidget *parent CardsDisplaySettings *cardsDisplay = &SettingsCache::instance().cardsDisplay(); const auto applyCardSearchLanguage = [this, cardsDisplay]() { databaseDisplayModel->setSearchLanguage(cardsDisplay->getCardLang(), - static_cast(cardsDisplay->getCardSearchLanguage())); + static_cast(cardsDisplay->getCardSearchLanguage())); }; applyCardSearchLanguage(); connect(cardsDisplay, &CardsDisplaySettings::cardLangChanged, this, applyCardSearchLanguage); diff --git a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp index 40f84215f..b0fd0e018 100644 --- a/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp +++ b/cockatrice/src/interface/widgets/settings_page/general_settings_page.cpp @@ -68,7 +68,7 @@ GeneralSettingsPage::GeneralSettingsPage() cardSearchLanguageBox.addItem(""); cardSearchLanguageBox.addItem(""); const int cardSearchLanguageIndex = SettingsCache::instance().cardsDisplay().getCardSearchLanguage(); - cardSearchLanguageBox.setCurrentIndex(cardSearchLanguageIndex < 0 ? static_cast(CardSearchLanguage::English) + cardSearchLanguageBox.setCurrentIndex(cardSearchLanguageIndex < 0 ? static_cast(SearchLanguageMode::English) : cardSearchLanguageIndex); connect(&cardSearchLanguageBox, qOverload(&QComboBox::currentIndexChanged), this, @@ -521,10 +521,10 @@ void GeneralSettingsPage::retranslateUi() cardLanguageNoteLabel.setText( tr("Foreign card names, text and art apply after you update the card database (Oracle).")); cardSearchLanguageLabel.setText(tr("Language used in card search:")); - cardSearchLanguageBox.setItemText(static_cast(CardSearchLanguage::English), tr("English")); - cardSearchLanguageBox.setItemText(static_cast(CardSearchLanguage::Selected), + cardSearchLanguageBox.setItemText(static_cast(SearchLanguageMode::English), tr("English")); + cardSearchLanguageBox.setItemText(static_cast(SearchLanguageMode::Selected), tr("Selected card language (untranslated cards still match in English)")); - cardSearchLanguageBox.setItemText(static_cast(CardSearchLanguage::Both), + cardSearchLanguageBox.setItemText(static_cast(SearchLanguageMode::Both), tr("English and selected card language")); advertiseTranslationPageLabel.setText( QString("%2").arg(WIKI_TRANSLATION_FAQ).arg(tr("How to help with translations"))); diff --git a/cockatrice/src/interface/widgets/utility/completer_utils.cpp b/cockatrice/src/interface/widgets/utility/completer_utils.cpp index 1f7111960..3c8cf69d4 100644 --- a/cockatrice/src/interface/widgets/utility/completer_utils.cpp +++ b/cockatrice/src/interface/widgets/utility/completer_utils.cpp @@ -20,7 +20,7 @@ void applyCardSearchLanguage(CardSearchModel *searchModel) { const auto &cardsDisplay = SettingsCache::instance().cardsDisplay(); searchModel->setSearchLanguage(cardsDisplay.getCardLang(), - static_cast(cardsDisplay.getCardSearchLanguage())); + static_cast(cardsDisplay.getCardSearchLanguage())); } } // namespace diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp index fb43dddcd..eae7d4b81 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_widget.cpp @@ -44,7 +44,7 @@ VisualDatabaseDisplayWidget::VisualDatabaseDisplayWidget(QWidget *parent, CardsDisplaySettings *cardsDisplay = &SettingsCache::instance().cardsDisplay(); const auto applyCardSearchLanguage = [this, cardsDisplay]() { databaseDisplayModel->setSearchLanguage(cardsDisplay->getCardLang(), - static_cast(cardsDisplay->getCardSearchLanguage())); + static_cast(cardsDisplay->getCardSearchLanguage())); }; applyCardSearchLanguage(); connect(cardsDisplay, &CardsDisplaySettings::cardLangChanged, this, applyCardSearchLanguage); diff --git a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp index f22de3c62..67451d0a2 100644 --- a/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp +++ b/cockatrice/src/interface/widgets/visual_deck_storage/visual_deck_storage_sort_filter_proxy_model.cpp @@ -192,7 +192,7 @@ void VisualDeckStorageSortFilterProxyModel::updateSearchMatches() const auto &cardsDisplay = SettingsCache::instance().cardsDisplay(); DeckFilterString filterString(searchText, cardsDisplay.getCardLang(), - static_cast(cardsDisplay.getCardSearchLanguage())); + static_cast(cardsDisplay.getCardSearchLanguage())); for (int row = 0; row < count; ++row) { const DeckPreviewData &data = source->dataForRow(row); diff --git a/libcockatrice_card/libcockatrice/card/card_localization.h b/libcockatrice_card/libcockatrice/card/card_localization.h index 450ee1805..e6127283d 100644 --- a/libcockatrice_card/libcockatrice/card/card_localization.h +++ b/libcockatrice_card/libcockatrice/card/card_localization.h @@ -18,7 +18,7 @@ /** * @brief The card languages card search should run against. */ -enum class CardSearchLanguage +enum class SearchLanguageMode { English, ///< Only search the English card names and texts. Selected, ///< Search the selected card language (untranslated cards still match in English). diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp index aff922f3f..47d1d0f61 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_string.cpp +++ b/libcockatrice_filters/libcockatrice/filters/filter_string.cpp @@ -83,7 +83,7 @@ static std::once_flag init; struct SearchLanguageContext { QString searchLanguage; - CardSearchLanguage searchLanguageMode = CardSearchLanguage::English; + SearchLanguageMode searchLanguageMode = SearchLanguageMode::English; }; thread_local SearchLanguageContext searchLanguageContext; @@ -92,14 +92,14 @@ namespace bool matchesInSearchLanguage(const QString &english, const QString &localized, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode, + SearchLanguageMode searchLanguageMode, const StringMatcher &matcher) { - if (searchLanguageMode == CardSearchLanguage::English) { + if (searchLanguageMode == SearchLanguageMode::English) { return matcher(english); } - if (searchLanguageMode == CardSearchLanguage::Both && matcher(english)) { + if (searchLanguageMode == SearchLanguageMode::Both && matcher(english)) { return true; } @@ -371,7 +371,7 @@ static void setupParserRules() search["OracleQuery"] = [](const peg::SemanticValues &sv) -> Filter { const auto matcher = std::any_cast(sv[0]); const QString searchLanguage = searchLanguageContext.searchLanguage; - const CardSearchLanguage searchLanguageMode = searchLanguageContext.searchLanguageMode; + const SearchLanguageMode searchLanguageMode = searchLanguageContext.searchLanguageMode; return [=](const CardData &x) { return matchesInSearchLanguage(x->getText(), x->getLocalizedText(searchLanguage), searchLanguage, searchLanguageMode, matcher); @@ -453,7 +453,7 @@ static void setupParserRules() search["GenericQuery"] = [](const peg::SemanticValues &sv) -> Filter { const auto matcher = std::any_cast(sv[0]); const QString searchLanguage = searchLanguageContext.searchLanguage; - const CardSearchLanguage searchLanguageMode = searchLanguageContext.searchLanguageMode; + const SearchLanguageMode searchLanguageMode = searchLanguageContext.searchLanguageMode; return [=](const CardData &x) { return matchesInSearchLanguage(x->getName(), x->getLocalizedName(searchLanguage), searchLanguage, searchLanguageMode, matcher); @@ -472,7 +472,7 @@ FilterString::FilterString() _error = "Not initialized"; } -FilterString::FilterString(const QString &expr, const QString &searchLanguage, CardSearchLanguage searchLanguageMode) +FilterString::FilterString(const QString &expr, const QString &searchLanguage, SearchLanguageMode searchLanguageMode) { QByteArray ba = expr.simplified().toUtf8(); diff --git a/libcockatrice_filters/libcockatrice/filters/filter_string.h b/libcockatrice_filters/libcockatrice/filters/filter_string.h index e0ed5650c..5709e9108 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_string.h +++ b/libcockatrice_filters/libcockatrice/filters/filter_string.h @@ -38,7 +38,7 @@ public: FilterString(); explicit FilterString(const QString &exp, const QString &searchLanguage = QString(), - CardSearchLanguage searchLanguageMode = CardSearchLanguage::English); + SearchLanguageMode searchLanguageMode = SearchLanguageMode::English); [[nodiscard]] bool check(const CardData &card) const { if (card.isNull()) { diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp index 1731f834d..3f54b556e 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp +++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp @@ -103,7 +103,7 @@ FilterTreeNode *FilterItemList::termNode(const QString &term) bool FilterItemList::testTypeAnd(const CardInfoPtr info, CardFilter::Attr attr, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const + SearchLanguageMode searchLanguageMode) const { for (auto i = childNodes.constBegin(); i != childNodes.constEnd(); i++) { if (!(*i)->isEnabled()) { @@ -121,7 +121,7 @@ bool FilterItemList::testTypeAnd(const CardInfoPtr info, bool FilterItemList::testTypeAndNot(const CardInfoPtr info, CardFilter::Attr attr, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const + SearchLanguageMode searchLanguageMode) const { // if any one in the list is true, return false return !testTypeOr(info, attr, searchLanguage, searchLanguageMode); @@ -130,7 +130,7 @@ bool FilterItemList::testTypeAndNot(const CardInfoPtr info, bool FilterItemList::testTypeOr(const CardInfoPtr info, CardFilter::Attr attr, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const + SearchLanguageMode searchLanguageMode) const { bool noChildEnabledChild = true; @@ -154,7 +154,7 @@ bool FilterItemList::testTypeOr(const CardInfoPtr info, bool FilterItemList::testTypeOrNot(const CardInfoPtr info, CardFilter::Attr attr, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const + SearchLanguageMode searchLanguageMode) const { // if any one in the list is false, return true return !testTypeAnd(info, attr, searchLanguage, searchLanguageMode); @@ -162,13 +162,13 @@ bool FilterItemList::testTypeOrNot(const CardInfoPtr info, bool FilterItem::acceptName(const CardInfoPtr info, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const + SearchLanguageMode searchLanguageMode) const { - if (searchLanguageMode == CardSearchLanguage::English) { + if (searchLanguageMode == SearchLanguageMode::English) { return info->getName().contains(term, Qt::CaseInsensitive); } - if (searchLanguageMode == CardSearchLanguage::Both && info->getName().contains(term, Qt::CaseInsensitive)) { + if (searchLanguageMode == SearchLanguageMode::Both && info->getName().contains(term, Qt::CaseInsensitive)) { return true; } @@ -181,13 +181,13 @@ bool FilterItem::acceptName(const CardInfoPtr info, bool FilterItem::acceptNameExact(const CardInfoPtr info, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const + SearchLanguageMode searchLanguageMode) const { - if (searchLanguageMode == CardSearchLanguage::English) { + if (searchLanguageMode == SearchLanguageMode::English) { return info->getName() == term; } - if (searchLanguageMode == CardSearchLanguage::Both && info->getName() == term) { + if (searchLanguageMode == SearchLanguageMode::Both && info->getName() == term) { return true; } @@ -255,13 +255,13 @@ bool FilterItem::acceptColor(const CardInfoPtr info) const bool FilterItem::acceptText(const CardInfoPtr info, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const + SearchLanguageMode searchLanguageMode) const { - if (searchLanguageMode == CardSearchLanguage::English) { + if (searchLanguageMode == SearchLanguageMode::English) { return info->getText().contains(term, Qt::CaseInsensitive); } - if (searchLanguageMode == CardSearchLanguage::Both && info->getText().contains(term, Qt::CaseInsensitive)) { + if (searchLanguageMode == SearchLanguageMode::Both && info->getText().contains(term, Qt::CaseInsensitive)) { return true; } @@ -459,7 +459,7 @@ bool FilterItem::relationCheck(int cardInfo) const bool FilterItem::acceptCardAttr(const CardInfoPtr info, CardFilter::Attr attr, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const + SearchLanguageMode searchLanguageMode) const { switch (attr) { case CardFilter::AttrName: @@ -544,7 +544,7 @@ FilterTreeNode *FilterTree::termNode(const CardFilter *f) bool FilterTree::testAttr(const CardInfoPtr info, const LogicMap *lm, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const + SearchLanguageMode searchLanguageMode) const { const FilterItemList *fil; bool status = true; @@ -579,7 +579,7 @@ bool FilterTree::testAttr(const CardInfoPtr info, bool FilterTree::acceptsCard(const CardInfoPtr info, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const + SearchLanguageMode searchLanguageMode) const { for (auto i = childNodes.constBegin(); i != childNodes.constEnd(); i++) { if ((*i)->isEnabled() && !testAttr(info, *i, searchLanguage, searchLanguageMode)) { diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.h b/libcockatrice_filters/libcockatrice/filters/filter_tree.h index e98106b53..116c01dcc 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_tree.h +++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.h @@ -171,19 +171,19 @@ public: [[nodiscard]] bool testTypeAnd(CardInfoPtr info, CardFilter::Attr attr, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const; + SearchLanguageMode searchLanguageMode) const; [[nodiscard]] bool testTypeAndNot(CardInfoPtr info, CardFilter::Attr attr, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const; + SearchLanguageMode searchLanguageMode) const; [[nodiscard]] bool testTypeOr(CardInfoPtr info, CardFilter::Attr attr, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const; + SearchLanguageMode searchLanguageMode) const; [[nodiscard]] bool testTypeOrNot(CardInfoPtr info, CardFilter::Attr attr, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const; + SearchLanguageMode searchLanguageMode) const; }; class FilterItem : public FilterTreeNode @@ -221,15 +221,15 @@ public: } [[nodiscard]] bool - acceptName(CardInfoPtr info, const QString &searchLanguage, CardSearchLanguage searchLanguageMode) const; + acceptName(CardInfoPtr info, const QString &searchLanguage, SearchLanguageMode searchLanguageMode) const; [[nodiscard]] bool - acceptNameExact(CardInfoPtr info, const QString &searchLanguage, CardSearchLanguage searchLanguageMode) const; + acceptNameExact(CardInfoPtr info, const QString &searchLanguage, SearchLanguageMode searchLanguageMode) const; [[nodiscard]] bool acceptType(CardInfoPtr info) const; [[nodiscard]] bool acceptMainType(CardInfoPtr info) const; [[nodiscard]] bool acceptSubType(CardInfoPtr info) const; [[nodiscard]] bool acceptColor(CardInfoPtr info) const; [[nodiscard]] bool - acceptText(CardInfoPtr info, const QString &searchLanguage, CardSearchLanguage searchLanguageMode) const; + acceptText(CardInfoPtr info, const QString &searchLanguage, SearchLanguageMode searchLanguageMode) const; [[nodiscard]] bool acceptSet(CardInfoPtr info) const; [[nodiscard]] bool acceptManaCost(CardInfoPtr info) const; [[nodiscard]] bool acceptCmc(CardInfoPtr info) const; @@ -239,7 +239,7 @@ public: [[nodiscard]] bool acceptCardAttr(CardInfoPtr info, CardFilter::Attr attr, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const; + SearchLanguageMode searchLanguageMode) const; [[nodiscard]] bool acceptFormat(CardInfoPtr info) const; [[nodiscard]] bool relationCheck(int cardInfo) const; }; @@ -262,7 +262,7 @@ private: bool testAttr(CardInfoPtr info, const LogicMap *lm, const QString &searchLanguage, - CardSearchLanguage searchLanguageMode) const; + SearchLanguageMode searchLanguageMode) const; void nodeChanged() const override { @@ -302,7 +302,7 @@ public: } [[nodiscard]] bool - acceptsCard(CardInfoPtr info, const QString &searchLanguage, CardSearchLanguage searchLanguageMode) const; + acceptsCard(CardInfoPtr info, const QString &searchLanguage, SearchLanguageMode searchLanguageMode) const; void removeFiltersByAttr(CardFilter::Attr filterType); void removeFilter(const CardFilter *toRemove); void clear(); diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp index 274719b3a..3c876c10d 100644 --- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp +++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.cpp @@ -68,7 +68,7 @@ void CardSearchModel::updateSearchResults(const QString &query) // The completer suggestions match against the same languages the card // search uses, so typing a localized name finds the card. QString matchName = card->getName(); - if (searchLanguageMode != CardSearchLanguage::English && !searchLanguage.isEmpty() && searchLanguage != "en") { + if (searchLanguageMode != SearchLanguageMode::English && !searchLanguage.isEmpty() && searchLanguage != "en") { matchName = card->getLocalizedName(searchLanguage); } const QString lowerName = matchName.toLower(); @@ -88,7 +88,7 @@ void CardSearchModel::updateSearchResults(const QString &query) auto sortByDistanceThenLength = [this](const SearchResult &a, const SearchResult &b) { QString nameA = a.card->getName(); QString nameB = b.card->getName(); - if (searchLanguageMode != CardSearchLanguage::English && !searchLanguage.isEmpty() && searchLanguage != "en") { + if (searchLanguageMode != SearchLanguageMode::English && !searchLanguage.isEmpty() && searchLanguage != "en") { nameA = a.card->getLocalizedName(searchLanguage); nameB = b.card->getLocalizedName(searchLanguage); } diff --git a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h index dcd61e37c..02f358eb1 100644 --- a/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card/card_search_model.h @@ -27,7 +27,7 @@ public: void updateSearchResults(const QString &query); // Update results based on input - void setSearchLanguage(const QString &searchLang, CardSearchLanguage mode) + void setSearchLanguage(const QString &searchLang, SearchLanguageMode mode) { if (searchLanguage == searchLang && searchLanguageMode == mode) { return; @@ -46,7 +46,7 @@ private: CardDatabaseDisplayModel *sourceModel; QList searchResults; QString searchLanguage; - CardSearchLanguage searchLanguageMode = CardSearchLanguage::English; + SearchLanguageMode searchLanguageMode = SearchLanguageMode::English; }; #endif // CARD_SEARCH_MODEL_H diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp index 89e2fbfdd..514e1026c 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp +++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.cpp @@ -191,7 +191,7 @@ bool CardDatabaseDisplayModel::filterAcceptsRow(int sourceRow, const QModelIndex bool CardDatabaseDisplayModel::rowMatchesCardName(CardInfoPtr info) const { if (!cardName.isEmpty() && !info->getName().contains(cardName, Qt::CaseInsensitive) && - searchLanguageMode != CardSearchLanguage::English && !searchLanguage.isEmpty() && searchLanguage != "en" && + searchLanguageMode != SearchLanguageMode::English && !searchLanguage.isEmpty() && searchLanguage != "en" && !info->getLocalizedName(searchLanguage).contains(cardName, Qt::CaseInsensitive)) { return false; } @@ -245,7 +245,7 @@ void CardDatabaseDisplayModel::setStringFilter(const QString &_src) dirty(); } -void CardDatabaseDisplayModel::setSearchLanguage(const QString &searchLang, CardSearchLanguage mode) +void CardDatabaseDisplayModel::setSearchLanguage(const QString &searchLang, SearchLanguageMode mode) { if (searchLanguage == searchLang && searchLanguageMode == mode) { return; diff --git a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h index 2a09a54d0..ff83bca49 100644 --- a/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h +++ b/libcockatrice_models/libcockatrice/models/database/card_database_display_model.h @@ -34,7 +34,7 @@ private: int loadedRowCount; QTimer dirtyTimer; QString searchLanguage; - CardSearchLanguage searchLanguageMode = CardSearchLanguage::English; + SearchLanguageMode searchLanguageMode = SearchLanguageMode::English; QString searchText; /** The translation table that will be used for sanitizeCardName. */ @@ -65,7 +65,7 @@ public: cardNameSet = _cardNameSet; dirty(); } - void setSearchLanguage(const QString &searchLang, CardSearchLanguage mode); + void setSearchLanguage(const QString &searchLang, SearchLanguageMode mode); void dirty() { diff --git a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp index 0996dc92e..94e888504 100644 --- a/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp +++ b/libcockatrice_settings/libcockatrice/settings/cards_display_settings.cpp @@ -112,7 +112,7 @@ QString CardsDisplaySettings::getCardLang() const int CardsDisplaySettings::getCardSearchLanguage() const { - return getValue("cardSearchLanguage", QString(), QString(), static_cast(CardSearchLanguage::English)).toInt(); + return getValue("cardSearchLanguage", QString(), QString(), static_cast(SearchLanguageMode::English)).toInt(); } void CardsDisplaySettings::setDisplayCardNames(bool _displayCardNames) diff --git a/tests/carddatabase/filter_string_test.cpp b/tests/carddatabase/filter_string_test.cpp index 85ef7c1c2..1f3a525df 100644 --- a/tests/carddatabase/filter_string_test.cpp +++ b/tests/carddatabase/filter_string_test.cpp @@ -84,42 +84,42 @@ CardInfoPtr localizedCat() TEST_F(CardQuery, SearchLanguageEnglishMatchesOnlyEnglish) { const CardData localized = localizedCat(); - ASSERT_TRUE(FilterString("Cat", "de", CardSearchLanguage::English).check(localized)); - ASSERT_FALSE(FilterString("Kater", "de", CardSearchLanguage::English).check(localized)); + ASSERT_TRUE(FilterString("Cat", "de", SearchLanguageMode::English).check(localized)); + ASSERT_FALSE(FilterString("Kater", "de", SearchLanguageMode::English).check(localized)); } TEST_F(CardQuery, SearchLanguageSelectedMatchesLocalizedNameAndText) { const CardData localized = localizedCat(); - ASSERT_TRUE(FilterString("Kater", "de", CardSearchLanguage::Selected).check(localized)); - ASSERT_TRUE(FilterString("o:miaut", "de", CardSearchLanguage::Selected).check(localized)); - ASSERT_FALSE(FilterString("Cat", "de", CardSearchLanguage::Selected).check(localized)); + ASSERT_TRUE(FilterString("Kater", "de", SearchLanguageMode::Selected).check(localized)); + ASSERT_TRUE(FilterString("o:miaut", "de", SearchLanguageMode::Selected).check(localized)); + ASSERT_FALSE(FilterString("Cat", "de", SearchLanguageMode::Selected).check(localized)); } TEST_F(CardQuery, SearchLanguageSelectedFallsBackToEnglishForUntranslatedCards) { const CardData localized = localizedCat(); - ASSERT_TRUE(FilterString("Cat", "fr", CardSearchLanguage::Selected).check(localized)); - ASSERT_FALSE(FilterString("Kater", "fr", CardSearchLanguage::Selected).check(localized)); + ASSERT_TRUE(FilterString("Cat", "fr", SearchLanguageMode::Selected).check(localized)); + ASSERT_FALSE(FilterString("Kater", "fr", SearchLanguageMode::Selected).check(localized)); } TEST_F(CardQuery, SearchLanguageBothMatchesEitherLanguage) { const CardData localized = localizedCat(); - ASSERT_TRUE(FilterString("Cat", "de", CardSearchLanguage::Both).check(localized)); - ASSERT_TRUE(FilterString("Kater", "de", CardSearchLanguage::Both).check(localized)); + ASSERT_TRUE(FilterString("Cat", "de", SearchLanguageMode::Both).check(localized)); + ASSERT_TRUE(FilterString("Kater", "de", SearchLanguageMode::Both).check(localized)); } TEST_F(CardQuery, SearchLanguageIsBoundPerInstance) { const CardData localized = localizedCat(); - FilterString germanQuery("Kater", "de", CardSearchLanguage::Selected); + FilterString germanQuery("Kater", "de", SearchLanguageMode::Selected); ASSERT_TRUE(germanQuery.check(localized)); // Constructing an English-bound instance afterwards must not change the // language the earlier instance searches in. - FilterString englishQuery("Kater", "", CardSearchLanguage::English); + FilterString englishQuery("Kater", "", SearchLanguageMode::English); ASSERT_FALSE(englishQuery.check(localized)); ASSERT_TRUE(germanQuery.check(localized)); } diff --git a/tests/settings/settings_defaults_test.cpp b/tests/settings/settings_defaults_test.cpp index fdf1c3fa2..95c14b306 100644 --- a/tests/settings/settings_defaults_test.cpp +++ b/tests/settings/settings_defaults_test.cpp @@ -565,14 +565,14 @@ TEST_F(SettingsDefaultsTest, CardsDisplay_CardLang_SetAndGet) TEST_F(SettingsDefaultsTest, CardsDisplay_CardSearchLanguage_Default) { CardsDisplaySettings s(settingsPath, nullptr); - ASSERT_EQ(s.getCardSearchLanguage(), static_cast(CardSearchLanguage::English)); + ASSERT_EQ(s.getCardSearchLanguage(), static_cast(SearchLanguageMode::English)); } TEST_F(SettingsDefaultsTest, CardsDisplay_CardSearchLanguage_SetAndGet) { CardsDisplaySettings s(settingsPath, nullptr); - s.setCardSearchLanguage(static_cast(CardSearchLanguage::Selected)); - ASSERT_EQ(s.getCardSearchLanguage(), static_cast(CardSearchLanguage::Selected)); + s.setCardSearchLanguage(static_cast(SearchLanguageMode::Selected)); + ASSERT_EQ(s.getCardSearchLanguage(), static_cast(SearchLanguageMode::Selected)); } // --- VisualDeckStorageSettings ---