jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-13 14:02:15 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Move enum to namespace.

Browse source 
Took 3 minutes
This commit is contained in:
Lukas Brübach 2025-11-09 21:55:44 +01:00
parent 348b0479be
commit 42879ca5db
2 changed files with 29 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

40
libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.cpp
View file

@ -106,18 +106,18 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const
case Qt::DisplayRole: case Qt::DisplayRole:
case Qt::EditRole: { case Qt::EditRole: {
switch (index.column()) { switch (index.column()) {
case CARD_AMOUNT: case DeckListModelColumns::CARD_AMOUNT:
return group->recursiveCount(true); return group->recursiveCount(true);
case CARD_NAME: case DeckListModelColumns::CARD_NAME:
if (role == Qt::DisplayRole) { if (role == Qt::DisplayRole) {
return group->getVisibleName(); return group->getVisibleName();
} }
return group->getName(); return group->getName();
case CARD_SET: case DeckListModelColumns::CARD_SET:
return group->getCardSetShortName(); return group->getCardSetShortName();
case CARD_COLLECTOR_NUMBER: case DeckListModelColumns::CARD_COLLECTOR_NUMBER:
return group->getCardCollectorNumber(); return group->getCardCollectorNumber();
case CARD_PROVIDER_ID: case DeckListModelColumns::CARD_PROVIDER_ID:
return group->getCardProviderId(); return group->getCardProviderId();
default: default:
return {}; return {};
@ -143,15 +143,15 @@ QVariant DeckListModel::data(const QModelIndex &index, int role) const
case Qt::DisplayRole: case Qt::DisplayRole:
case Qt::EditRole: case Qt::EditRole:
switch (index.column()) { switch (index.column()) {
case CARD_AMOUNT: case DeckListModelColumns::CARD_AMOUNT:
return card->getNumber(); return card->getNumber();
case CARD_NAME: case DeckListModelColumns::CARD_NAME:
return card->getName(); return card->getName();
case CARD_SET: case DeckListModelColumns::CARD_SET:
return card->getCardSetShortName(); return card->getCardSetShortName();
case CARD_COLLECTOR_NUMBER: case DeckListModelColumns::CARD_COLLECTOR_NUMBER:
return card->getCardCollectorNumber(); return card->getCardCollectorNumber();
case CARD_PROVIDER_ID: case DeckListModelColumns::CARD_PROVIDER_ID:
return card->getCardProviderId(); return card->getCardProviderId();
default: default:
return {}; return {};
@ -198,15 +198,15 @@ QVariant DeckListModel::headerData(const int section, const Qt::Orientation orie
} }
switch (section) { switch (section) {
case CARD_AMOUNT: case DeckListModelColumns::CARD_AMOUNT:
return tr("Count"); return tr("Count");
case CARD_NAME: case DeckListModelColumns::CARD_NAME:
return tr("Card"); return tr("Card");
case CARD_SET: case DeckListModelColumns::CARD_SET:
return tr("Set"); return tr("Set");
case CARD_COLLECTOR_NUMBER: case DeckListModelColumns::CARD_COLLECTOR_NUMBER:
return tr("Number"); return tr("Number");
case CARD_PROVIDER_ID: case DeckListModelColumns::CARD_PROVIDER_ID:
return tr("Provider ID"); return tr("Provider ID");
default: default:
return {}; return {};
@ -263,19 +263,19 @@ bool DeckListModel::setData(const QModelIndex &index, const QVariant &value, con
} }
switch (index.column()) { switch (index.column()) {
case CARD_AMOUNT: case DeckListModelColumns::CARD_AMOUNT:
node->setNumber(value.toInt()); node->setNumber(value.toInt());
break; break;
case CARD_NAME: case DeckListModelColumns::CARD_NAME:
node->setName(value.toString()); node->setName(value.toString());
break; break;
case CARD_SET: case DeckListModelColumns::CARD_SET:
node->setCardSetShortName(value.toString()); node->setCardSetShortName(value.toString());
break; break;
case CARD_COLLECTOR_NUMBER: case DeckListModelColumns::CARD_COLLECTOR_NUMBER:
node->setCardCollectorNumber(value.toString()); node->setCardCollectorNumber(value.toString());
break; break;
case CARD_PROVIDER_ID: case DeckListModelColumns::CARD_PROVIDER_ID:
node->setCardProviderId(value.toString()); node->setCardProviderId(value.toString());
break; break;
default: default:

12
libcockatrice_models/libcockatrice/models/deck_list/deck_list_model.h
View file

@ -12,21 +12,27 @@ class CardDatabase;
class QPrinter; class QPrinter;
class QTextCursor; class QTextCursor;
namespace DeckRoles { namespace DeckRoles
enum { {
enum
{
IsCardRole = Qt::UserRole + 1, IsCardRole = Qt::UserRole + 1,
DepthRole, DepthRole,
IsLegalRole IsLegalRole
}; };
} }
enum ModelColumns{ namespace DeckListModelColumns
{
enum
{
CARD_AMOUNT = 0, CARD_AMOUNT = 0,
CARD_NAME = 1, CARD_NAME = 1,
CARD_SET = 2, CARD_SET = 2,
CARD_COLLECTOR_NUMBER = 3, CARD_COLLECTOR_NUMBER = 3,
CARD_PROVIDER_ID = 4 CARD_PROVIDER_ID = 4
}; };
}
/** /**
* @brief Specifies the criteria used to group cards in the DeckListModel. * @brief Specifies the criteria used to group cards in the DeckListModel.