From 82dd4c08e7a5a3ce2c1da296f6f95debf92d6dfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Mon, 10 Nov 2025 13:18:21 +0100 Subject: [PATCH] Adjust to namespace. Took 4 minutes Took 1 minute --- .../widgets/deck_editor/deck_editor_deck_dock_widget.cpp | 4 ++-- .../libcockatrice/models/deck_list/deck_list_model.cpp | 2 +- .../libcockatrice/models/deck_list/deck_list_model.h | 6 +++--- 3 files changed, 6 insertions(+), 6 deletions(-) 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 0efcda491..fed70f5d6 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 @@ -117,8 +117,8 @@ void DeckEditorDeckDockWidget::createDeckDock() activeGroupCriteriaComboBox->addItem(tr("Mana Cost"), DeckListModelGroupCriteria::MANA_COST); activeGroupCriteriaComboBox->addItem(tr("Colors"), DeckListModelGroupCriteria::COLOR); connect(activeGroupCriteriaComboBox, QOverload::of(&QComboBox::currentIndexChanged), [this]() { - deckModel->setActiveGroupCriteria( - static_cast(activeGroupCriteriaComboBox->currentData(Qt::UserRole).toInt())); + deckModel->setActiveGroupCriteria(static_cast( + activeGroupCriteriaComboBox->currentData(Qt::UserRole).toInt())); deckModel->sort(deckView->header()->sortIndicatorSection(), deckView->header()->sortIndicatorOrder()); deckView->expandAll(); deckView->expandAll(); diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp index b629d71d1..52e3b678c 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp @@ -521,7 +521,7 @@ void DeckListModel::sort(int column, Qt::SortOrder order) emit layoutChanged(); } -void DeckListModel::setActiveGroupCriteria(DeckListModelGroupCriteria newCriteria) +void DeckListModel::setActiveGroupCriteria(DeckListModelGroupCriteria::Type newCriteria) { activeGroupCriteria = newCriteria; rebuildTree(); diff --git a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h index 093a7e162..8beabd4ba 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h @@ -68,7 +68,7 @@ namespace DeckListModelGroupCriteria * @enum DeckListModelGroupCriteria * @brief Available grouping strategies for deck visualization. */ -enum +enum Type { MAIN_TYPE, /**< Group cards by their main type (e.g., creature, instant). */ MANA_COST, /**< Group cards by their total mana cost. */ @@ -283,12 +283,12 @@ public: * @brief Sets the criteria used to group cards in the model. * @param newCriteria The new grouping criteria. */ - void setActiveGroupCriteria(DeckListModelGroupCriteria newCriteria); + void setActiveGroupCriteria(DeckListModelGroupCriteria::Type newCriteria); private: DeckList *deckList; /**< Pointer to the deck loader providing the underlying data. */ InnerDecklistNode *root; /**< Root node of the model tree. */ - DeckListModelGroupCriteria activeGroupCriteria = DeckListModelGroupCriteria::MAIN_TYPE; + DeckListModelGroupCriteria::Type activeGroupCriteria = DeckListModelGroupCriteria::MAIN_TYPE; int lastKnownColumn; /**< Last column used for sorting. */ Qt::SortOrder lastKnownOrder; /**< Last known sort order. */