From fc43df35b47fce042f692241d763130f57d3b4eb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Lukas=20Br=C3=BCbach?= Date: Sun, 9 Nov 2025 16:00:21 +0100 Subject: [PATCH] Enum for model columns. Took 9 minutes --- .../models/deck_list/deck_list_model.cpp | 40 +++++++++---------- .../models/deck_list/deck_list_model.h | 8 ++++ 2 files changed, 28 insertions(+), 20 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 81193b6da..9506f67f6 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp @@ -106,21 +106,21 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const case Qt::DisplayRole: case Qt::EditRole: { switch (index.column()) { - case 0: { + case CARD_AMOUNT: { return group->recursiveCount(true); } - case 1: { + case CARD_NAME: { if (role == Qt::DisplayRole) return group->getVisibleName(); return group->getName(); } - case 2: { + case CARD_SET: { return group->getCardSetShortName(); } - case 3: { + case CARD_COLLECTOR_NUMBER: { return group->getCardCollectorNumber(); } - case 4: { + case CARD_PROVIDER_ID: { return group->getCardProviderId(); } default: @@ -151,19 +151,19 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const case Qt::DisplayRole: case Qt::EditRole: switch (index.column()) { - case 0: { + case CARD_AMOUNT: { return card->getNumber(); } - case 1: { + case CARD_NAME: { return card->getName(); } - case 2: { + case CARD_SET: { return card->getCardSetShortName(); } - case 3: { + case CARD_COLLECTOR_NUMBER: { return card->getCardCollectorNumber(); } - case 4: { + case CARD_PROVIDER_ID: { return card->getCardProviderId(); } default: { @@ -212,15 +212,15 @@ QVariant DeckListModel::headerData(const int section, const Qt::Orientation orie } switch (section) { - case 0: + case CARD_AMOUNT: return tr("Count"); - case 1: + case CARD_NAME: return tr("Card"); - case 2: + case CARD_SET: return tr("Set"); - case 3: + case CARD_COLLECTOR_NUMBER: return tr("Number"); - case 4: + case CARD_PROVIDER_ID: return tr("Provider ID"); default: return {}; @@ -277,19 +277,19 @@ bool DeckListModel::setData(const QModelIndex &index, const QVariant &value, con } switch (index.column()) { - case 0: + case CARD_AMOUNT: node->setNumber(value.toInt()); break; - case 1: + case CARD_NAME: node->setName(value.toString()); break; - case 2: + case CARD_SET: node->setCardSetShortName(value.toString()); break; - case 3: + case CARD_COLLECTOR_NUMBER: node->setCardCollectorNumber(value.toString()); break; - case 4: + case 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 0d8ce628c..5439f15a1 100644 --- a/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h +++ b/libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h @@ -20,6 +20,14 @@ enum { }; } +enum ModelColumns{ + 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. */