From f5080424a62fd5471ee75da127ab292f43d41419 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Basile=20Cl=C3=A9ment?= Date: Thu, 1 May 2025 13:21:09 +0200 Subject: [PATCH] Use SettingsManager --- cockatrice/src/settings/card_counter_settings.cpp | 8 ++++---- cockatrice/src/settings/card_counter_settings.h | 7 +++---- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/cockatrice/src/settings/card_counter_settings.cpp b/cockatrice/src/settings/card_counter_settings.cpp index 027844f24..1cb989452 100644 --- a/cockatrice/src/settings/card_counter_settings.cpp +++ b/cockatrice/src/settings/card_counter_settings.cpp @@ -4,7 +4,7 @@ #include CardCounterSettings::CardCounterSettings(const QString &settingsPath, QObject *parent) - : QObject(parent), m_settings(new QSettings(settingsPath + "global.ini", QSettings::IniFormat)) + : SettingsManager(settingsPath + "global.ini", parent) { } @@ -12,10 +12,10 @@ void CardCounterSettings::setColor(int counterId, const QColor &color) { QString key = QString("cards/counters/%1/color").arg(counterId); - if (m_settings->value(key).value() == color) + if (settings.value(key).value() == color) return; - m_settings->setValue(key, color); + settings.setValue(key, color); emit colorChanged(counterId, color); } @@ -35,7 +35,7 @@ QColor CardCounterSettings::color(int counterId) const defaultColor = QColor::fromHsv(h, s, v); } - return m_settings->value(QString("cards/counters/%1/color").arg(counterId), defaultColor).value(); + return settings.value(QString("cards/counters/%1/color").arg(counterId), defaultColor).value(); } QString CardCounterSettings::displayName(int counterId) const diff --git a/cockatrice/src/settings/card_counter_settings.h b/cockatrice/src/settings/card_counter_settings.h index 545cfc95b..bb3a9bd57 100644 --- a/cockatrice/src/settings/card_counter_settings.h +++ b/cockatrice/src/settings/card_counter_settings.h @@ -1,12 +1,14 @@ #ifndef CARD_COUNTER_SETTINGS_H #define CARD_COUNTER_SETTINGS_H +#include "settings_manager.h" + #include class QSettings; class QColor; -class CardCounterSettings : public QObject +class CardCounterSettings : public SettingsManager { Q_OBJECT @@ -22,9 +24,6 @@ public slots: signals: void colorChanged(int counterId, const QColor &color); - -private: - QSettings *m_settings; }; #endif // CARD_COUNTER_SETTINGS_H