jeirmeister/Cockatrice
1
0
Fork 0
mirror of https://github.com/Cockatrice/Cockatrice.git synced 2026-07-17 07:52:16 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Lint and build fix.

Browse source
This commit is contained in:
Lukas Brübach 2025-05-10 00:29:53 +02:00
parent bd78c5b4f6
commit 2553a22c5a
2 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

4
cockatrice/src/client/ui/widgets/deck_editor/deck_editor_deck_dock_widget.cpp
View file

@ -110,7 +110,7 @@ void DeckEditorDeckDockWidget::createDeckDock()
activeGroupCriteriaComboBox->addItem(tr("Main Type"), DeckListModelGroupCriteria::MAIN_TYPE); activeGroupCriteriaComboBox->addItem(tr("Main Type"), DeckListModelGroupCriteria::MAIN_TYPE);
activeGroupCriteriaComboBox->addItem(tr("Mana Cost"), DeckListModelGroupCriteria::MANA_COST); activeGroupCriteriaComboBox->addItem(tr("Mana Cost"), DeckListModelGroupCriteria::MANA_COST);
activeGroupCriteriaComboBox->addItem(tr("Colors"), DeckListModelGroupCriteria::COLOR); activeGroupCriteriaComboBox->addItem(tr("Colors"), DeckListModelGroupCriteria::COLOR);
connect(activeGroupCriteriaComboBox, &QComboBox::currentIndexChanged, [this]() { connect(activeGroupCriteriaComboBox, QOverload<int>::of(&QComboBox::currentIndexChanged), [this]() {
deckModel->setActiveGroupCriteria( deckModel->setActiveGroupCriteria(
static_cast<DeckListModelGroupCriteria>(activeGroupCriteriaComboBox->currentData(Qt::UserRole).toInt())); static_cast<DeckListModelGroupCriteria>(activeGroupCriteriaComboBox->currentData(Qt::UserRole).toInt()));
deckView->expandAll(); deckView->expandAll();
@ -170,8 +170,6 @@ void DeckEditorDeckDockWidget::createDeckDock()
hashLabel->setReadOnly(true); hashLabel->setReadOnly(true);
hashLabel->setFrame(false); hashLabel->setFrame(false);
auto *lowerLayout = new QGridLayout; auto *lowerLayout = new QGridLayout;
lowerLayout->setObjectName("lowerLayout"); lowerLayout->setObjectName("lowerLayout");
lowerLayout->addWidget(hashLabel1, 0, 0); lowerLayout->addWidget(hashLabel1, 0, 0);

6
cockatrice/src/deck/deck_list_model.cpp
View file

@ -29,7 +29,8 @@ DeckListModel::~DeckListModel()
delete root; delete root;
} }
QString DeckListModel::getSortCriteriaForCard(CardInfoPtr info){ QString DeckListModel::getSortCriteriaForCard(CardInfoPtr info)
{
if (!info) { if (!info) {
return "unknown"; return "unknown";
} }
@ -484,7 +485,8 @@ void DeckListModel::sort(int column, Qt::SortOrder order)
emit layoutChanged(); emit layoutChanged();
} }
void DeckListModel::setActiveGroupCriteria(DeckListModelGroupCriteria newCriteria){ void DeckListModel::setActiveGroupCriteria(DeckListModelGroupCriteria newCriteria)
{
activeGroupCriteria = newCriteria; activeGroupCriteria = newCriteria;
rebuildTree(); rebuildTree();
} }