X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsettings.cpp;h=1fbe04aeca130c82f57cd8dd42e709d24580e565;hp=f157d357184345967f0526043bdaaef855f234ee;hb=52209badc8e769e50aa3019b63689dda0e79e9d0;hpb=2c8434f74c68194d56f2084f637419123e61d18b diff --git a/src/common/settings.cpp b/src/common/settings.cpp index f157d357..1fbe04ae 100644 --- a/src/common/settings.cpp +++ b/src/common/settings.cpp @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2018 by the Quassel Project * + * Copyright (C) 2005-2019 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -18,43 +18,42 @@ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. * ***************************************************************************/ -#include - #include "settings.h" -const int VERSION = 1; /// Settings version for backwords/forwards incompatible changes +#include + +const int VERSION = 1; /// Settings version for backwords/forwards incompatible changes // This is used if no VersionMinor key exists, e.g. upgrading from a Quassel version before this // change. This shouldn't be increased from 1; instead, change the logic in Core::Core() and // QtUiApplication::init() to handle upgrading and downgrading. -const int VERSION_MINOR_INITIAL = 1; /// Initial settings version for compatible changes +const int VERSION_MINOR_INITIAL = 1; /// Initial settings version for compatible changes QHash Settings::_settingsCache; QHash Settings::_settingsKeyPersistedCache; QHash> Settings::_settingsChangeNotifier; #ifdef Q_OS_MAC -# define create_qsettings QSettings s(QCoreApplication::organizationDomain(), _appName) +# define create_qsettings QSettings s(QCoreApplication::organizationDomain(), _appName) #else -# define create_qsettings QSettings s(fileName(), format()) +# define create_qsettings QSettings s(fileName(), format()) #endif Settings::Settings(QString group, QString appName) - : _group(std::move(group)), _appName(std::move(appName)) + : _group(std::move(group)) + , _appName(std::move(appName)) {} - -void Settings::setGroup(QString group) { +void Settings::setGroup(QString group) +{ _group = std::move(group); } - -QString Settings::keyForNotify(const QString &key) const +QString Settings::keyForNotify(const QString& key) const { return key; } - uint Settings::version() const { // we don't cache this value, and we ignore the group @@ -68,7 +67,6 @@ uint Settings::version() const return ver; } - uint Settings::versionMinor() const { // Don't cache this value; ignore the group @@ -85,12 +83,12 @@ uint Settings::versionMinor() const // const_cast is ok, because setVersionMinor() doesn't actually change this instance const_cast(this)->setVersionMinor(VERSION_MINOR_INITIAL); return VERSION_MINOR_INITIAL; - } else { + } + else { return verMinor; } } - void Settings::setVersionMinor(const uint versionMinor) { // Don't cache this value; ignore the group @@ -99,7 +97,6 @@ void Settings::setVersionMinor(const uint versionMinor) s.setValue("Config/VersionMinor", versionMinor); } - QSettings::Format Settings::format() const { #ifdef Q_OS_WIN @@ -109,27 +106,24 @@ QSettings::Format Settings::format() const #endif } - bool Settings::sync() { create_qsettings; s.sync(); switch (s.status()) { - case QSettings::NoError: - return true; - default: - return false; + case QSettings::NoError: + return true; + default: + return false; } } - bool Settings::isWritable() const { create_qsettings; return s.isWritable(); } - QStringList Settings::allLocalKeys() const { create_qsettings; @@ -139,8 +133,7 @@ QStringList Settings::allLocalKeys() const return res; } - -QStringList Settings::localChildKeys(const QString &rootkey) const +QStringList Settings::localChildKeys(const QString& rootkey) const { QString g; if (rootkey.isEmpty()) @@ -155,8 +148,7 @@ QStringList Settings::localChildKeys(const QString &rootkey) const return res; } - -QStringList Settings::localChildGroups(const QString &rootkey) const +QStringList Settings::localChildGroups(const QString& rootkey) const { QString g; if (rootkey.isEmpty()) @@ -171,8 +163,7 @@ QStringList Settings::localChildGroups(const QString &rootkey) const return res; } - -void Settings::setLocalValue(const QString &key, const QVariant &data) +void Settings::setLocalValue(const QString& key, const QVariant& data) { QString normKey = normalizedKey(_group, key); create_qsettings; @@ -184,8 +175,7 @@ void Settings::setLocalValue(const QString &key, const QVariant &data) } } - -QVariant Settings::localValue(const QString &key, const QVariant &def) const +QVariant Settings::localValue(const QString& key, const QVariant& def) const { QString normKey = normalizedKey(_group, key); if (!isCached(normKey)) { @@ -203,8 +193,7 @@ QVariant Settings::localValue(const QString &key, const QVariant &def) const return def; } - -bool Settings::localKeyExists(const QString &key) const +bool Settings::localKeyExists(const QString& key) const { QString normKey = normalizedKey(_group, key); if (!isKeyPersistedCached(normKey)) { @@ -217,8 +206,7 @@ bool Settings::localKeyExists(const QString &key) const return cacheKeyPersisted(normKey); } - -void Settings::removeLocalKey(const QString &key) +void Settings::removeLocalKey(const QString& key) { create_qsettings; s.beginGroup(_group); @@ -236,67 +224,56 @@ void Settings::removeLocalKey(const QString &key) } } - QString Settings::fileName() const { - return Quassel::configDirPath() + _appName - + ((format() == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini")); + return Quassel::configDirPath() + _appName + ((format() == QSettings::NativeFormat) ? QLatin1String(".conf") : QLatin1String(".ini")); } - -QString Settings::normalizedKey(const QString &group, const QString &key) const +QString Settings::normalizedKey(const QString& group, const QString& key) const { if (group.isEmpty()) return key; return group + '/' + key; } - -void Settings::setCacheKeyPersisted(const QString &normKey, bool exists) const +void Settings::setCacheKeyPersisted(const QString& normKey, bool exists) const { _settingsKeyPersistedCache[normKey] = exists; } - -bool Settings::cacheKeyPersisted(const QString &normKey) const +bool Settings::cacheKeyPersisted(const QString& normKey) const { return _settingsKeyPersistedCache[normKey]; } - -bool Settings::isKeyPersistedCached(const QString &normKey) const +bool Settings::isKeyPersistedCached(const QString& normKey) const { return _settingsKeyPersistedCache.contains(normKey); } - -void Settings::setCacheValue(const QString &normKey, const QVariant &data) const +void Settings::setCacheValue(const QString& normKey, const QVariant& data) const { _settingsCache[normKey] = data; } - -QVariant Settings::cacheValue(const QString &normKey) const +QVariant Settings::cacheValue(const QString& normKey) const { return _settingsCache[normKey]; } - -bool Settings::isCached(const QString &normKey) const +bool Settings::isCached(const QString& normKey) const { return _settingsCache.contains(normKey); } - -SettingsChangeNotifier *Settings::notifier(const QString &normKey) const +SettingsChangeNotifier* Settings::notifier(const QString& normKey) const { if (!hasNotifier(normKey)) _settingsChangeNotifier[normKey] = std::make_shared(); return _settingsChangeNotifier[normKey].get(); } - -bool Settings::hasNotifier(const QString &normKey) const +bool Settings::hasNotifier(const QString& normKey) const { return _settingsChangeNotifier.contains(normKey); }