From 42879ca5dbe353d009ab01a6d6d3d7490a59e20b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 9 Nov 2025 21:55:44 +0100 Subject: [PATCH] Move enum to namespace. Took 3 minutes --- .../models/deck_list/deck_list_model.cpp | 40 +++++++++---------- .../models/deck_list/deck_list_model.h | 12 ++++-- 2 files changed, 29 insertions(+), 23 deletions(-) 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 0b1f4ad35..b629d71d1 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp @@ -106,18 +106,18 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const case Qt::DisplayRole: case Qt::EditRole: { switch (index.column()) { - case CARD_AMOUNT: + case DeckListModelColumns::CARD_AMOUNT: return group->recursiveCount(true); - case CARD_NAME: + case DeckListModelColumns::CARD_NAME: if (role == Qt::DisplayRole) { return group->getVisibleName(); } return group->getName(); - case CARD_SET: + case DeckListModelColumns::CARD_SET: return group->getCardSetShortName(); - case CARD_COLLECTOR_NUMBER: + case DeckListModelColumns::CARD_COLLECTOR_NUMBER: return group->getCardCollectorNumber(); - case CARD_PROVIDER_ID: + case DeckListModelColumns::CARD_PROVIDER_ID: return group->getCardProviderId(); default: return {}; @@ -143,15 +143,15 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const case Qt::DisplayRole: case Qt::EditRole: switch (index.column()) { - case CARD_AMOUNT: + case DeckListModelColumns::CARD_AMOUNT: return card->getNumber(); - case CARD_NAME: + case DeckListModelColumns::CARD_NAME: return card->getName(); - case CARD_SET: + case DeckListModelColumns::CARD_SET: return card->getCardSetShortName(); - case CARD_COLLECTOR_NUMBER: + case DeckListModelColumns::CARD_COLLECTOR_NUMBER: return card->getCardCollectorNumber(); - case CARD_PROVIDER_ID: + case DeckListModelColumns::CARD_PROVIDER_ID: return card->getCardProviderId(); default: return {}; @@ -198,15 +198,15 @@ QVariant DeckListModel::headerData(const int section, const Qt::Orientation orie } switch (section) { - case CARD_AMOUNT: + case DeckListModelColumns::CARD_AMOUNT: return tr("Count"); - case CARD_NAME: + case DeckListModelColumns::CARD_NAME: return tr("Card"); - case CARD_SET: + case DeckListModelColumns::CARD_SET: return tr("Set"); - case CARD_COLLECTOR_NUMBER: + case DeckListModelColumns::CARD_COLLECTOR_NUMBER: return tr("Number"); - case CARD_PROVIDER_ID: + case DeckListModelColumns::CARD_PROVIDER_ID: return tr("Provider ID"); default: return {}; @@ -263,19 +263,19 @@ bool DeckListModel::setData(const QModelIndex &index, const QVariant &value, con } switch (index.column()) { - case CARD_AMOUNT: + case DeckListModelColumns::CARD_AMOUNT: node->setNumber(value.toInt()); break; - case CARD_NAME: + case DeckListModelColumns::CARD_NAME: node->setName(value.toString()); break; - case CARD_SET: + case DeckListModelColumns::CARD_SET: node->setCardSetShortName(value.toString()); break; - case CARD_COLLECTOR_NUMBER: + case DeckListModelColumns::CARD_COLLECTOR_NUMBER: node->setCardCollectorNumber(value.toString()); break; - case CARD_PROVIDER_ID: + case DeckListModelColumns::CARD_PROVIDER_ID: node->setCardProviderId(value.toString()); break; default: 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 5439f15a1..b5abca4c8 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h @@ -12,21 +12,27 @@ class CardDatabase; class QPrinter; class QTextCursor; -namespace DeckRoles { -enum { +namespace DeckRoles +{ +enum +{ IsCardRole = Qt::UserRole + 1, DepthRole, IsLegalRole }; } -enum ModelColumns{ +namespace DeckListModelColumns +{ +enum +{ CARD_AMOUNT = 0, CARD_NAME = 1, CARD_SET = 2, CARD_COLLECTOR_NUMBER = 3, CARD_PROVIDER_ID = 4 }; +} /** * @brief Specifies the criteria used to group cards in the DeckListModel.