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

refactor: Settings make the internal setting objects children

Browse source
This commit is contained in:
sithlord48 2025-11-13 16:25:22 -05:00 committed by Chris Rizzitello
parent 999f174441
commit 4df7c54afb
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -30,7 +30,7 @@ void Settings::setSettingsFile(const QString &settingsFile)
if (instance()->m_settings) if (instance()->m_settings)
instance()->m_settings->deleteLater(); instance()->m_settings->deleteLater();
instance()->m_settings = new QSettings(settingsFile, QSettings::IniFormat); instance()->m_settings = new QSettings(settingsFile, QSettings::IniFormat, instance());
instance()->m_settingsProxy->load(settingsFile); instance()->m_settingsProxy->load(settingsFile);
qInfo().noquote() << "settings file changed:" << instance()->m_settings->fileName(); qInfo().noquote() << "settings file changed:" << instance()->m_settings->fileName();
} }
@ -45,7 +45,7 @@ void Settings::setStateFile(const QString &stateFile)
if (instance()->m_stateSettings) if (instance()->m_stateSettings)
instance()->m_stateSettings->deleteLater(); instance()->m_stateSettings->deleteLater();
instance()->m_stateSettings = new QSettings(stateFile, QSettings::IniFormat); instance()->m_stateSettings = new QSettings(stateFile, QSettings::IniFormat, instance());
qInfo().noquote() << "settings file changed:" << instance()->m_stateSettings->fileName(); qInfo().noquote() << "settings file changed:" << instance()->m_stateSettings->fileName();
} }
@ -68,7 +68,7 @@ Settings::Settings(QObject *parent) : QObject(parent)
else else
fileToLoad = UserSettingFile; fileToLoad = UserSettingFile;
m_settings = new QSettings(fileToLoad, QSettings::IniFormat); m_settings = new QSettings(fileToLoad, QSettings::IniFormat, this);
m_settingsProxy = std::make_shared<QSettingsProxy>(); m_settingsProxy = std::make_shared<QSettingsProxy>();
m_settingsProxy->load(fileToLoad); m_settingsProxy->load(fileToLoad);
qInfo().noquote() << "initial settings file:" << m_settings->fileName(); qInfo().noquote() << "initial settings file:" << m_settings->fileName();
@ -78,7 +78,7 @@ Settings::Settings(QObject *parent) : QObject(parent)
: QStandardPaths::standardLocations(QStandardPaths::GenericStateLocation).at(0); : QStandardPaths::standardLocations(QStandardPaths::GenericStateLocation).at(0);
const auto stateFile = QStringLiteral("%1/%2.state").arg(stateBase, kAppName); const auto stateFile = QStringLiteral("%1/%2.state").arg(stateBase, kAppName);
m_stateSettings = new QSettings(stateFile, QSettings::IniFormat); m_stateSettings = new QSettings(stateFile, QSettings::IniFormat, this);
} }
void Settings::cleanSettings() void Settings::cleanSettings()