From f02f572dac157360f3f015fed01f736a48031375 Mon Sep 17 00:00:00 2001 From: Jurriaan van den Berg Date: Mon, 19 Oct 2026 03:24:04 +0200 Subject: [PATCH] Style fix --- ...l_database_display_color_filter_widget.cpp | 22 +++++++++++-------- .../libcockatrice/filters/filter_card.h | 2 +- .../libcockatrice/filters/filter_tree.cpp | 2 +- 3 files changed, 15 insertions(+), 11 deletions(-) diff --git a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp index ac6d78a63..90cfd9cd8 100644 --- a/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp +++ b/cockatrice/src/interface/widgets/visual_database_display/visual_database_display_color_filter_widget.cpp @@ -148,7 +148,8 @@ void VisualDatabaseDisplayColorFilterWidget::removeFilter(QChar color) case FilterMode::Commander: removeFilters(filterModel, color, CardFilter::Attr::AttrColorIdentity); - filterModel->addFilter(new CardFilter(color, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColorIdentity)); + filterModel->addFilter( + new CardFilter(color, CardFilter::Type::TypeAndNot, CardFilter::Attr::AttrColorIdentity)); break; } } @@ -210,9 +211,7 @@ QList VisualDatabaseDisplayColorFilterWidget::getActiveColors() void VisualDatabaseDisplayColorFilterWidget::syncWithFilterModel() { QList allColorFilters = filterModel->getFiltersOfType( - currentMode == FilterMode::Commander - ? CardFilter::Attr::AttrColorIdentity - : CardFilter::Attr::AttrColor); + currentMode == FilterMode::Commander ? CardFilter::Attr::AttrColorIdentity : CardFilter::Attr::AttrColor); QList manaSymbolWidgets = findChildren(); @@ -223,25 +222,30 @@ void VisualDatabaseDisplayColorFilterWidget::syncWithFilterModel() if (symbol == filter->term()) { switch (currentMode) { case FilterMode::ExactMatch: - if (filter->type() == CardFilter::Type::TypeAnd) + if (filter->type() == CardFilter::Type::TypeAnd) { found = true; + } break; case FilterMode::Includes: case FilterMode::IncludeExclude: - if (filter->type() == CardFilter::Type::TypeOr) + if (filter->type() == CardFilter::Type::TypeOr) { found = true; + } break; case FilterMode::Excludes: - if (filter->type() == CardFilter::Type::TypeAndNot) + if (filter->type() == CardFilter::Type::TypeAndNot) { found = true; + } break; case FilterMode::Commander: - if (filter->type() == CardFilter::Type::TypeAndNot) + if (filter->type() == CardFilter::Type::TypeAndNot) { found = false; + } break; } - if (found) + if (found) { break; + } } } diff --git a/libcockatrice_filters/libcockatrice/filters/filter_card.h b/libcockatrice_filters/libcockatrice/filters/filter_card.h index 7e4efbd96..bc613fc9c 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_card.h +++ b/libcockatrice_filters/libcockatrice/filters/filter_card.h @@ -55,7 +55,7 @@ private: enum Attr a; public: - CardFilter(QString const &term, Type type, Attr attr) : trm(term), t(type), a(attr) + CardFilter(const QString &term, Type type, Attr attr) : trm(term), t(type), a(attr) { } diff --git a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp index 1448c7ba1..1c5ebe2e3 100644 --- a/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp +++ b/libcockatrice_filters/libcockatrice/filters/filter_tree.cpp @@ -227,7 +227,7 @@ bool FilterItem::acceptSubType(const CardInfoPtr info) const return typeParts.size() > 1 && typeParts[1].contains(term, Qt::CaseInsensitive); } -static bool matchesColor(QString const &term, QString const &colors) { +static bool matchesColor(const QString &term, const QString &colors) { QString converted_term = term.trimmed().toLower(); converted_term.replace("green", "g");