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

refactor: Rename setSettingFile to setSettingsFile for consistency

Browse source
This commit is contained in:
Nick Bolton 2025-10-15 13:42:55 +01:00 committed by Chris Rizzitello
parent bb1394ceeb
commit 687fd5411a
8 changed files with 9 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -18,7 +18,7 @@ Settings *Settings::instance()
return &m; return &m;
} }
void Settings::setSettingFile(const QString &settingsFile) void Settings::setSettingsFile(const QString &settingsFile)
{ {
if (instance()->settingsFile() == settingsFile) { if (instance()->settingsFile() == settingsFile) {
qDebug("settings file already set, skipping"); qDebug("settings file already set, skipping");

2
src/lib/common/Settings.h
View file

@ -115,7 +115,7 @@ public:
Q_ENUM(CoreMode) Q_ENUM(CoreMode)
static Settings *instance(); static Settings *instance();
static void setSettingFile(const QString &settingsFile = QString()); static void setSettingsFile(const QString &settingsFile = QString());
static void setValue(const QString &key = QString(), const QVariant &value = QVariant()); static void setValue(const QString &key = QString(), const QVariant &value = QVariant());
static QVariant value(const QString &key = QString()); static QVariant value(const QString &key = QString());
static void restoreDefaultSettings(); static void restoreDefaultSettings();

2
src/lib/deskflow/CoreArgParser.cpp
View file

@ -47,7 +47,7 @@ void CoreArgParser::parse()
} }
if (m_parser.isSet(CoreArgs::configOption)) { if (m_parser.isSet(CoreArgs::configOption)) {
Settings::setSettingFile(m_parser.value(CoreArgs::configOption)); Settings::setSettingsFile(m_parser.value(CoreArgs::configOption));
} }
if (m_parser.isSet(CoreArgs::interfaceOption)) { if (m_parser.isSet(CoreArgs::interfaceOption)) {

4
src/unittests/common/SettingsTests.cpp
View file

@ -16,9 +16,9 @@ void SettingsTests::initTestCase()
oldSettings.remove(); oldSettings.remove();
} }
void SettingsTests::setSettingFile() void SettingsTests::setSettingsFile()
{ {
Settings::setSettingFile(m_settingsFile); Settings::setSettingsFile(m_settingsFile);
} }
void SettingsTests::settingsFile() void SettingsTests::settingsFile()

2
src/unittests/common/SettingsTests.h
View file

@ -14,7 +14,7 @@ class SettingsTests : public QObject
private Q_SLOTS: private Q_SLOTS:
void initTestCase(); void initTestCase();
// Test are run in order top to bottom // Test are run in order top to bottom
void setSettingFile(); void setSettingsFile();
void settingsFile(); void settingsFile();
void settingsPath(); void settingsPath();
void tlsDir(); void tlsDir();

2
src/unittests/deskflow/CoreArgParserTests.cpp
View file

@ -17,7 +17,7 @@ void CoreArgParserTests::initTestCase()
if (oldSettings.exists()) if (oldSettings.exists())
oldSettings.remove(); oldSettings.remove();
Settings::setSettingFile(m_settingsFile); Settings::setSettingsFile(m_settingsFile);
} }
void CoreArgParserTests::interfaceLong() void CoreArgParserTests::interfaceLong()

2
src/unittests/gui/config/ScreenTests.cpp
View file

@ -19,7 +19,7 @@ void ScreenTests::initTestCase()
if (oldSettings.exists()) if (oldSettings.exists())
oldSettings.remove(); oldSettings.remove();
Settings::setSettingFile(m_settingsFile); Settings::setSettingsFile(m_settingsFile);
} }
void ScreenTests::basicFunctionality() void ScreenTests::basicFunctionality()

2
src/unittests/legacytests/legacytests/main.cpp
View file

@ -26,7 +26,7 @@ int main(int argc, char **argv)
// HACK: Unit tests should not use the filesystem. // HACK: Unit tests should not use the filesystem.
std::filesystem::create_directories(testDir); std::filesystem::create_directories(testDir);
Settings::setSettingFile("tmp/test/settings.ini"); Settings::setSettingsFile("tmp/test/settings.ini");
Settings::setValue(Settings::Server::ExternalConfig, true); Settings::setValue(Settings::Server::ExternalConfig, true);
ExitTimeout exitTimeout(1, "Unit tests"); ExitTimeout exitTimeout(1, "Unit tests");