From 5d8ebff892db884bdf679652fdb6b863e76e8418 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Basile=20Cl=C3=A9ment?= Date: Thu, 20 Mar 2025 21:49:04 +0100 Subject: [PATCH] Use QAbstractButton::toggled Also, fix dbconverter build --- cockatrice/src/dialogs/dlg_manage_sets.cpp | 19 +++---------------- cockatrice/src/dialogs/dlg_manage_sets.h | 2 +- dbconverter/src/mocks.cpp | 3 +++ 3 files changed, 7 insertions(+), 17 deletions(-) diff --git a/cockatrice/src/dialogs/dlg_manage_sets.cpp b/cockatrice/src/dialogs/dlg_manage_sets.cpp index b608f7dd1..799de7495 100644 --- a/cockatrice/src/dialogs/dlg_manage_sets.cpp +++ b/cockatrice/src/dialogs/dlg_manage_sets.cpp @@ -166,12 +166,7 @@ WndSets::WndSets(QWidget *parent) : QMainWindow(parent) includeOnlineOnlyCards = SettingsCache::instance().getIncludeOnlineOnlyCards(); QCheckBox *onlineOnly = new QCheckBox(tr("Include online-only (Arena) cards [requires restart]")); onlineOnly->setChecked(includeOnlineOnlyCards); -#if QT_VERSION >= QT_VERSION_CHECK(6, 7, 0) - connect(onlineOnly, &QCheckBox::checkStateChanged, this, &WndSets::onlineOnlyCheckStateChanged); -#else - connect(onlineOnly, &QCheckBox::stateChanged, this, - [this](int state) { onlineOnlyCheckStateChanged(static_cast(state)); }); -#endif + connect(onlineOnly, &QAbstractButton::toggled, this, &WndSets::includeOnlineOnlyCardsChanged); buttonBox = new QDialogButtonBox(QDialogButtonBox::Ok | QDialogButtonBox::Cancel); connect(buttonBox, SIGNAL(accepted()), this, SLOT(actSave())); @@ -251,17 +246,9 @@ void WndSets::rebuildMainLayout(int actionToTake) } } -void WndSets::onlineOnlyCheckStateChanged(Qt::CheckState state) +void WndSets::includeOnlineOnlyCardsChanged(bool _includeOnlineOnlyCards) { - switch (state) { - case Qt::Unchecked: - includeOnlineOnlyCards = false; - break; - - default: - includeOnlineOnlyCards = true; - break; - } + includeOnlineOnlyCards = _includeOnlineOnlyCards; } void WndSets::actSave() diff --git a/cockatrice/src/dialogs/dlg_manage_sets.h b/cockatrice/src/dialogs/dlg_manage_sets.h index dd7e7cde9..13dea7fef 100644 --- a/cockatrice/src/dialogs/dlg_manage_sets.h +++ b/cockatrice/src/dialogs/dlg_manage_sets.h @@ -74,7 +74,7 @@ private slots: void actDisableResetButton(const QString &filterText); void actSort(int index); void actIgnoreWarning(); - void onlineOnlyCheckStateChanged(Qt::CheckState state); + void includeOnlineOnlyCardsChanged(bool _includeOnlineOnlyCardsChanged); }; #endif diff --git a/dbconverter/src/mocks.cpp b/dbconverter/src/mocks.cpp index e2f6ed4df..06889d2b3 100644 --- a/dbconverter/src/mocks.cpp +++ b/dbconverter/src/mocks.cpp @@ -199,6 +199,9 @@ void SettingsCache::setPrintingSelectorSortOrder(int /* _printingSelectorSortOrd void SettingsCache::setPrintingSelectorCardSize(int /* _printingSelectorCardSize */) { } +void SettingsCache::setIncludeOnlineOnlyCards(bool /* _includeOnlineOnlyCards */) +{ +} void SettingsCache::setPrintingSelectorNavigationButtonsVisible(QT_STATE_CHANGED_T /* _navigationButtonsVisible */) { }