smw/deskflow
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

refactor: Settings use Static methods where possible internally

Browse source
This commit is contained in:
sithlord48 2025-07-11 13:00:50 -04:00 committed by Nick Bolton
parent d69febe2dc
commit 1079c22736
1 changed files with 8 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
src/lib/common/Settings.cpp
View file

@ -92,7 +92,7 @@ QVariant Settings::defaultValue(const QString &key)
return QRect(); return QRect();
if (key == Security::Certificate) if (key == Security::Certificate)
return QStringLiteral("%1/%2").arg(instance()->tlsDir(), kTlsCertificateFilename); return QStringLiteral("%1/%2").arg(Settings::tlsDir(), kTlsCertificateFilename);
if (key == Security::KeySize) if (key == Security::KeySize)
return 2048; return 2048;
@ -110,19 +110,19 @@ QVariant Settings::defaultValue(const QString &key)
return kServerBinName; return kServerBinName;
if (key == Daemon::Elevate) if (key == Daemon::Elevate)
return instance()->isNativeMode(); return Settings::isNativeMode();
if (key == Core::UpdateUrl) if (key == Core::UpdateUrl)
return kUrlUpdateCheck; return kUrlUpdateCheck;
if (key == Server::ExternalConfigFile) if (key == Server::ExternalConfigFile)
return QStringLiteral("%1/%2-server.conf").arg(instance()->settingsPath(), kAppId); return QStringLiteral("%1/%2-server.conf").arg(Settings::settingsPath(), kAppId);
if (key == Core::Port) if (key == Core::Port)
return 24800; return 24800;
if (key == Core::ProcessMode) { if (key == Core::ProcessMode) {
if (instance()->isNativeMode()) if (Settings::isNativeMode())
return Settings::ProcessMode::Service; return Settings::ProcessMode::Service;
else else
return Settings::ProcessMode::Desktop; return Settings::ProcessMode::Desktop;
@ -132,7 +132,7 @@ QVariant Settings::defaultValue(const QString &key)
#ifdef Q_OS_WIN #ifdef Q_OS_WIN
return QStringLiteral("%1/%2").arg(QCoreApplication::applicationDirPath(), kDaemonLogFilename); return QStringLiteral("%1/%2").arg(QCoreApplication::applicationDirPath(), kDaemonLogFilename);
#else #else
return QStringLiteral("%1/%2").arg(instance()->settingsPath(), kDaemonLogFilename); return QStringLiteral("%1/%2").arg(Settings::settingsPath(), kDaemonLogFilename);
#endif #endif
} }
@ -141,7 +141,7 @@ QVariant Settings::defaultValue(const QString &key)
QString Settings::logLevelText() QString Settings::logLevelText()
{ {
return instance()->m_logLevels.at(instance()->value(Log::Level).toInt()); return Settings::m_logLevels.at(Settings::value(Log::Level).toInt());
} }
QSettingsProxy &Settings::proxy() QSettingsProxy &Settings::proxy()
@ -158,12 +158,12 @@ void Settings::save(bool emitSaving)
QStringList Settings::validKeys() QStringList Settings::validKeys()
{ {
return instance()->m_validKeys; return Settings::m_validKeys;
} }
bool Settings::isWritable() bool Settings::isWritable()
{ {
if (instance()->isNativeMode()) if (Settings::isNativeMode())
return true; return true;
return instance()->m_settings->isWritable(); return instance()->m_settings->isWritable();
} }