Make SettingsManager params const ref (#5405)

* pass settingsPath by const ref

* pass params by const ref

* cleanup
This commit is contained in:
RickyRister 2025-01-01 21:33:37 -08:00 committed by GitHub
parent f924b04efd
commit bb4214e28a
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
16 changed files with 25 additions and 26 deletions

View file

@ -1,6 +1,6 @@
#include "card_database_settings.h" #include "card_database_settings.h"
CardDatabaseSettings::CardDatabaseSettings(QString settingPath, QObject *parent) CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent)
: SettingsManager(settingPath + "cardDatabase.ini", parent) : SettingsManager(settingPath + "cardDatabase.ini", parent)
{ {
} }

View file

@ -25,7 +25,7 @@ signals:
public slots: public slots:
private: private:
explicit CardDatabaseSettings(QString settingPath, QObject *parent = nullptr); explicit CardDatabaseSettings(const QString &settingPath, QObject *parent = nullptr);
CardDatabaseSettings(const CardDatabaseSettings & /*other*/); CardDatabaseSettings(const CardDatabaseSettings & /*other*/);
}; };

View file

@ -1,6 +1,6 @@
#include "card_override_settings.h" #include "card_override_settings.h"
CardOverrideSettings::CardOverrideSettings(QString settingPath, QObject *parent) CardOverrideSettings::CardOverrideSettings(const QString &settingPath, QObject *parent)
: SettingsManager(settingPath + "cardPreferenceOverrides.ini", parent) : SettingsManager(settingPath + "cardPreferenceOverrides.ini", parent)
{ {
} }

View file

@ -18,7 +18,7 @@ public:
QString getCardPreferenceOverride(const QString &cardName); QString getCardPreferenceOverride(const QString &cardName);
private: private:
explicit CardOverrideSettings(QString settingPath, QObject *parent = nullptr); explicit CardOverrideSettings(const QString &settingPath, QObject *parent = nullptr);
CardOverrideSettings(const CardOverrideSettings & /*other*/); CardOverrideSettings(const CardOverrideSettings & /*other*/);
}; };

View file

@ -3,7 +3,7 @@
#include <QCryptographicHash> #include <QCryptographicHash>
#include <QTime> #include <QTime>
GameFiltersSettings::GameFiltersSettings(QString settingPath, QObject *parent) GameFiltersSettings::GameFiltersSettings(const QString &settingPath, QObject *parent)
: SettingsManager(settingPath + "gamefilters.ini", parent) : SettingsManager(settingPath + "gamefilters.ini", parent)
{ {
} }

View file

@ -46,7 +46,7 @@ signals:
public slots: public slots:
private: private:
explicit GameFiltersSettings(QString settingPath, QObject *parent = nullptr); explicit GameFiltersSettings(const QString &settingPath, QObject *parent = nullptr);
GameFiltersSettings(const GameFiltersSettings & /*other*/); GameFiltersSettings(const GameFiltersSettings & /*other*/);
QString hashGameType(const QString &gameType) const; QString hashGameType(const QString &gameType) const;

View file

@ -1,6 +1,6 @@
#include "message_settings.h" #include "message_settings.h"
MessageSettings::MessageSettings(QString settingPath, QObject *parent) MessageSettings::MessageSettings(const QString &settingPath, QObject *parent)
: SettingsManager(settingPath + "messages.ini", parent) : SettingsManager(settingPath + "messages.ini", parent)
{ {
} }

View file

@ -20,7 +20,7 @@ signals:
public slots: public slots:
private: private:
explicit MessageSettings(QString settingPath, QObject *parent = nullptr); explicit MessageSettings(const QString &settingPath, QObject *parent = nullptr);
MessageSettings(const MessageSettings & /*other*/); MessageSettings(const MessageSettings & /*other*/);
}; };

View file

@ -2,7 +2,7 @@
#define MAX_RECENT_DECK_COUNT 10 #define MAX_RECENT_DECK_COUNT 10
RecentsSettings::RecentsSettings(QString settingPath, QObject *parent) RecentsSettings::RecentsSettings(const QString &settingPath, QObject *parent)
: SettingsManager(settingPath + "recents.ini", parent) : SettingsManager(settingPath + "recents.ini", parent)
{ {
} }

View file

@ -8,7 +8,7 @@ class RecentsSettings : public SettingsManager
Q_OBJECT Q_OBJECT
friend class SettingsCache; friend class SettingsCache;
explicit RecentsSettings(QString settingPath, QObject *parent = nullptr); explicit RecentsSettings(const QString &settingPath, QObject *parent = nullptr);
RecentsSettings(const RecentsSettings & /*other*/); RecentsSettings(const RecentsSettings & /*other*/);
public: public:

View file

@ -3,7 +3,7 @@
#include <QDebug> #include <QDebug>
#include <utility> #include <utility>
ServersSettings::ServersSettings(QString settingPath, QObject *parent) ServersSettings::ServersSettings(const QString &settingPath, QObject *parent)
: SettingsManager(settingPath + "servers.ini", parent) : SettingsManager(settingPath + "servers.ini", parent)
{ {
} }

View file

@ -61,7 +61,7 @@ public:
bool getClearDebugLogStatus(bool abDefaultValue); bool getClearDebugLogStatus(bool abDefaultValue);
private: private:
explicit ServersSettings(QString settingPath, QObject *parent = nullptr); explicit ServersSettings(const QString &settingPath, QObject *parent = nullptr);
ServersSettings(const ServersSettings & /*other*/); ServersSettings(const ServersSettings & /*other*/);
}; };

View file

@ -1,11 +1,14 @@
#include "settings_manager.h" #include "settings_manager.h"
SettingsManager::SettingsManager(QString settingPath, QObject *parent) SettingsManager::SettingsManager(const QString &settingPath, QObject *parent)
: QObject(parent), settings(settingPath, QSettings::IniFormat) : QObject(parent), settings(settingPath, QSettings::IniFormat)
{ {
} }
void SettingsManager::setValue(QVariant value, QString name, QString group, QString subGroup) void SettingsManager::setValue(const QVariant &value,
const QString &name,
const QString &group,
const QString &subGroup)
{ {
if (!group.isEmpty()) { if (!group.isEmpty()) {
settings.beginGroup(group); settings.beginGroup(group);
@ -26,7 +29,7 @@ void SettingsManager::setValue(QVariant value, QString name, QString group, QStr
} }
} }
void SettingsManager::deleteValue(QString name, QString group, QString subGroup) void SettingsManager::deleteValue(const QString &name, const QString &group, const QString &subGroup)
{ {
if (!group.isEmpty()) { if (!group.isEmpty()) {
settings.beginGroup(group); settings.beginGroup(group);
@ -47,7 +50,7 @@ void SettingsManager::deleteValue(QString name, QString group, QString subGroup)
} }
} }
QVariant SettingsManager::getValue(QString name, QString group, QString subGroup) QVariant SettingsManager::getValue(const QString &name, const QString &group, const QString &subGroup)
{ {
if (!group.isEmpty()) { if (!group.isEmpty()) {
settings.beginGroup(group); settings.beginGroup(group);

View file

@ -10,18 +10,14 @@ class SettingsManager : public QObject
{ {
Q_OBJECT Q_OBJECT
public: public:
explicit SettingsManager(QString settingPath, QObject *parent = nullptr); explicit SettingsManager(const QString &settingPath, QObject *parent = nullptr);
QVariant getValue(QString name, QString group = "", QString subGroup = ""); QVariant getValue(const QString &name, const QString &group = "", const QString &subGroup = "");
void sync(); void sync();
signals:
public slots:
protected: protected:
QSettings settings; QSettings settings;
void setValue(QVariant value, QString name, QString group = "", QString subGroup = ""); void setValue(const QVariant &value, const QString &name, const QString &group = "", const QString &subGroup = "");
void deleteValue(QString name, QString group = "", QString subGroup = ""); void deleteValue(const QString &name, const QString &group = "", const QString &subGroup = "");
}; };
#endif // SETTINGSMANAGER_H #endif // SETTINGSMANAGER_H

View file

@ -1,7 +1,7 @@
#include "mocks.h" #include "mocks.h"
CardDatabaseSettings::CardDatabaseSettings(QString settingPath, QObject *parent) CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent)
: SettingsManager(settingPath + "cardDatabase.ini", parent) : SettingsManager(settingPath + "cardDatabase.ini", parent)
{ {
} }

View file

@ -1,7 +1,7 @@
#include "mocks.h" #include "mocks.h"
CardDatabaseSettings::CardDatabaseSettings(QString settingPath, QObject *parent) CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent)
: SettingsManager(settingPath + "cardDatabase.ini", parent) : SettingsManager(settingPath + "cardDatabase.ini", parent)
{ {
} }