diff --git a/cockatrice/src/settings/card_database_settings.cpp b/cockatrice/src/settings/card_database_settings.cpp index 777d7b568..f0b8d58b1 100644 --- a/cockatrice/src/settings/card_database_settings.cpp +++ b/cockatrice/src/settings/card_database_settings.cpp @@ -1,6 +1,6 @@ #include "card_database_settings.h" -CardDatabaseSettings::CardDatabaseSettings(QString settingPath, QObject *parent) +CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "cardDatabase.ini", parent) { } diff --git a/cockatrice/src/settings/card_database_settings.h b/cockatrice/src/settings/card_database_settings.h index 9923a8003..421fb60bb 100644 --- a/cockatrice/src/settings/card_database_settings.h +++ b/cockatrice/src/settings/card_database_settings.h @@ -25,7 +25,7 @@ signals: public slots: private: - explicit CardDatabaseSettings(QString settingPath, QObject *parent = nullptr); + explicit CardDatabaseSettings(const QString &settingPath, QObject *parent = nullptr); CardDatabaseSettings(const CardDatabaseSettings & /*other*/); }; diff --git a/cockatrice/src/settings/card_override_settings.cpp b/cockatrice/src/settings/card_override_settings.cpp index 0bcdcf5e5..c3331fd0a 100644 --- a/cockatrice/src/settings/card_override_settings.cpp +++ b/cockatrice/src/settings/card_override_settings.cpp @@ -1,6 +1,6 @@ #include "card_override_settings.h" -CardOverrideSettings::CardOverrideSettings(QString settingPath, QObject *parent) +CardOverrideSettings::CardOverrideSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "cardPreferenceOverrides.ini", parent) { } diff --git a/cockatrice/src/settings/card_override_settings.h b/cockatrice/src/settings/card_override_settings.h index 1f6b08817..dae3e4daf 100644 --- a/cockatrice/src/settings/card_override_settings.h +++ b/cockatrice/src/settings/card_override_settings.h @@ -18,7 +18,7 @@ public: QString getCardPreferenceOverride(const QString &cardName); private: - explicit CardOverrideSettings(QString settingPath, QObject *parent = nullptr); + explicit CardOverrideSettings(const QString &settingPath, QObject *parent = nullptr); CardOverrideSettings(const CardOverrideSettings & /*other*/); }; diff --git a/cockatrice/src/settings/game_filters_settings.cpp b/cockatrice/src/settings/game_filters_settings.cpp index adb0e094f..ebcbb04aa 100644 --- a/cockatrice/src/settings/game_filters_settings.cpp +++ b/cockatrice/src/settings/game_filters_settings.cpp @@ -3,7 +3,7 @@ #include #include -GameFiltersSettings::GameFiltersSettings(QString settingPath, QObject *parent) +GameFiltersSettings::GameFiltersSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "gamefilters.ini", parent) { } diff --git a/cockatrice/src/settings/game_filters_settings.h b/cockatrice/src/settings/game_filters_settings.h index 6129f36ad..4e5047974 100644 --- a/cockatrice/src/settings/game_filters_settings.h +++ b/cockatrice/src/settings/game_filters_settings.h @@ -46,7 +46,7 @@ signals: public slots: private: - explicit GameFiltersSettings(QString settingPath, QObject *parent = nullptr); + explicit GameFiltersSettings(const QString &settingPath, QObject *parent = nullptr); GameFiltersSettings(const GameFiltersSettings & /*other*/); QString hashGameType(const QString &gameType) const; diff --git a/cockatrice/src/settings/message_settings.cpp b/cockatrice/src/settings/message_settings.cpp index 75f43cc64..786ea9cd1 100644 --- a/cockatrice/src/settings/message_settings.cpp +++ b/cockatrice/src/settings/message_settings.cpp @@ -1,6 +1,6 @@ #include "message_settings.h" -MessageSettings::MessageSettings(QString settingPath, QObject *parent) +MessageSettings::MessageSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "messages.ini", parent) { } diff --git a/cockatrice/src/settings/message_settings.h b/cockatrice/src/settings/message_settings.h index 4c4dcc5fa..6d65ce6e8 100644 --- a/cockatrice/src/settings/message_settings.h +++ b/cockatrice/src/settings/message_settings.h @@ -20,7 +20,7 @@ signals: public slots: private: - explicit MessageSettings(QString settingPath, QObject *parent = nullptr); + explicit MessageSettings(const QString &settingPath, QObject *parent = nullptr); MessageSettings(const MessageSettings & /*other*/); }; diff --git a/cockatrice/src/settings/recents_settings.cpp b/cockatrice/src/settings/recents_settings.cpp index a9250ecf6..da3c5313e 100644 --- a/cockatrice/src/settings/recents_settings.cpp +++ b/cockatrice/src/settings/recents_settings.cpp @@ -2,7 +2,7 @@ #define MAX_RECENT_DECK_COUNT 10 -RecentsSettings::RecentsSettings(QString settingPath, QObject *parent) +RecentsSettings::RecentsSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "recents.ini", parent) { } diff --git a/cockatrice/src/settings/recents_settings.h b/cockatrice/src/settings/recents_settings.h index ce66d5ccc..c240b100d 100644 --- a/cockatrice/src/settings/recents_settings.h +++ b/cockatrice/src/settings/recents_settings.h @@ -8,7 +8,7 @@ class RecentsSettings : public SettingsManager Q_OBJECT friend class SettingsCache; - explicit RecentsSettings(QString settingPath, QObject *parent = nullptr); + explicit RecentsSettings(const QString &settingPath, QObject *parent = nullptr); RecentsSettings(const RecentsSettings & /*other*/); public: diff --git a/cockatrice/src/settings/servers_settings.cpp b/cockatrice/src/settings/servers_settings.cpp index 88ffac398..2ddf99361 100644 --- a/cockatrice/src/settings/servers_settings.cpp +++ b/cockatrice/src/settings/servers_settings.cpp @@ -3,7 +3,7 @@ #include #include -ServersSettings::ServersSettings(QString settingPath, QObject *parent) +ServersSettings::ServersSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "servers.ini", parent) { } diff --git a/cockatrice/src/settings/servers_settings.h b/cockatrice/src/settings/servers_settings.h index ec9ad10fb..e5d266e87 100644 --- a/cockatrice/src/settings/servers_settings.h +++ b/cockatrice/src/settings/servers_settings.h @@ -61,7 +61,7 @@ public: bool getClearDebugLogStatus(bool abDefaultValue); private: - explicit ServersSettings(QString settingPath, QObject *parent = nullptr); + explicit ServersSettings(const QString &settingPath, QObject *parent = nullptr); ServersSettings(const ServersSettings & /*other*/); }; diff --git a/cockatrice/src/settings/settings_manager.cpp b/cockatrice/src/settings/settings_manager.cpp index 39a1cd647..dc2da741e 100644 --- a/cockatrice/src/settings/settings_manager.cpp +++ b/cockatrice/src/settings/settings_manager.cpp @@ -1,11 +1,14 @@ #include "settings_manager.h" -SettingsManager::SettingsManager(QString settingPath, QObject *parent) +SettingsManager::SettingsManager(const QString &settingPath, QObject *parent) : 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()) { 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()) { 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()) { settings.beginGroup(group); diff --git a/cockatrice/src/settings/settings_manager.h b/cockatrice/src/settings/settings_manager.h index c951fce83..cd1242962 100644 --- a/cockatrice/src/settings/settings_manager.h +++ b/cockatrice/src/settings/settings_manager.h @@ -10,18 +10,14 @@ class SettingsManager : public QObject { Q_OBJECT public: - explicit SettingsManager(QString settingPath, QObject *parent = nullptr); - QVariant getValue(QString name, QString group = "", QString subGroup = ""); + explicit SettingsManager(const QString &settingPath, QObject *parent = nullptr); + QVariant getValue(const QString &name, const QString &group = "", const QString &subGroup = ""); void sync(); -signals: - -public slots: - protected: QSettings settings; - void setValue(QVariant value, QString name, QString group = "", QString subGroup = ""); - void deleteValue(QString name, QString group = "", QString subGroup = ""); + void setValue(const QVariant &value, const QString &name, const QString &group = "", const QString &subGroup = ""); + void deleteValue(const QString &name, const QString &group = "", const QString &subGroup = ""); }; #endif // SETTINGSMANAGER_H diff --git a/dbconverter/src/mocks.cpp b/dbconverter/src/mocks.cpp index 016f5073f..7efeb9992 100644 --- a/dbconverter/src/mocks.cpp +++ b/dbconverter/src/mocks.cpp @@ -1,7 +1,7 @@ #include "mocks.h" -CardDatabaseSettings::CardDatabaseSettings(QString settingPath, QObject *parent) +CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "cardDatabase.ini", parent) { } diff --git a/tests/carddatabase/mocks.cpp b/tests/carddatabase/mocks.cpp index 6dbe05304..f47bae36b 100644 --- a/tests/carddatabase/mocks.cpp +++ b/tests/carddatabase/mocks.cpp @@ -1,7 +1,7 @@ #include "mocks.h" -CardDatabaseSettings::CardDatabaseSettings(QString settingPath, QObject *parent) +CardDatabaseSettings::CardDatabaseSettings(const QString &settingPath, QObject *parent) : SettingsManager(settingPath + "cardDatabase.ini", parent) { }