diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp index dddecd4f4..c10b1f72c 100644 --- a/src/lib/common/Settings.cpp +++ b/src/lib/common/Settings.cpp @@ -139,7 +139,7 @@ QVariant Settings::defaultValue(const QString &key) return QVariant(); } -const QString Settings::logLevelText() +QString Settings::logLevelText() { return instance()->m_logLevels.at(instance()->value(Log::Level).toInt()); } @@ -156,7 +156,7 @@ void Settings::save(bool emitSaving) instance()->m_settings->sync(); } -const QStringList Settings::validKeys() +QStringList Settings::validKeys() { return instance()->m_validKeys; } @@ -173,34 +173,34 @@ bool Settings::isNativeMode() return instance()->m_settings->format() == QSettings::NativeFormat; } -const QString Settings::settingsFile() +QString Settings::settingsFile() { return instance()->m_settings->fileName(); } -const QString Settings::settingsPath() +QString Settings::settingsPath() { if (instance()->isNativeMode()) return SystemDir; return QFileInfo(instance()->m_settings->fileName()).absolutePath(); } -const QString Settings::tlsDir() +QString Settings::tlsDir() { return QStringLiteral("%1/%2").arg(instance()->settingsPath(), kTlsDirName); } -const QString Settings::tlsLocalDb() +QString Settings::tlsLocalDb() { return QStringLiteral("%1/%2").arg(instance()->tlsDir(), kTlsFingerprintLocalFilename); } -const QString Settings::tlsTrustedServersDb() +QString Settings::tlsTrustedServersDb() { return QStringLiteral("%1/%2").arg(instance()->tlsDir(), kTlsFingerprintTrustedServersFilename); } -const QString Settings::tlsTrustedClientsDb() +QString Settings::tlsTrustedClientsDb() { return QStringLiteral("%1/%2").arg(instance()->tlsDir(), kTlsFingerprintTrustedClientsFilename); } diff --git a/src/lib/common/Settings.h b/src/lib/common/Settings.h index 2d5f8490f..c3bc87a48 100644 --- a/src/lib/common/Settings.h +++ b/src/lib/common/Settings.h @@ -118,16 +118,16 @@ public: static QVariant defaultValue(const QString &key); static bool isWritable(); static bool isNativeMode(); - static const QString settingsFile(); - static const QString settingsPath(); - static const QString tlsDir(); - static const QString tlsLocalDb(); - static const QString tlsTrustedServersDb(); - static const QString tlsTrustedClientsDb(); - static const QString logLevelText(); + static QString settingsFile(); + static QString settingsPath(); + static QString tlsDir(); + static QString tlsLocalDb(); + static QString tlsTrustedServersDb(); + static QString tlsTrustedClientsDb(); + static QString logLevelText(); static QSettingsProxy &proxy(); static void save(bool emitSaving = true); - static const QStringList validKeys(); + static QStringList validKeys(); Q_SIGNALS: void settingsChanged(const QString key);