diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp index 4c6e49d0d..ebd5ad203 100644 --- a/src/lib/common/Settings.cpp +++ b/src/lib/common/Settings.cpp @@ -18,7 +18,7 @@ Settings *Settings::instance() return &m; } -void Settings::setSettingFile(const QString &settingsFile) +void Settings::setSettingsFile(const QString &settingsFile) { if (instance()->settingsFile() == settingsFile) { qDebug("settings file already set, skipping"); diff --git a/src/lib/common/Settings.h b/src/lib/common/Settings.h index 8e0973108..d24644b04 100644 --- a/src/lib/common/Settings.h +++ b/src/lib/common/Settings.h @@ -115,7 +115,7 @@ public: Q_ENUM(CoreMode) 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 QVariant value(const QString &key = QString()); static void restoreDefaultSettings(); diff --git a/src/lib/deskflow/CoreArgParser.cpp b/src/lib/deskflow/CoreArgParser.cpp index 24c11d506..0f7841727 100644 --- a/src/lib/deskflow/CoreArgParser.cpp +++ b/src/lib/deskflow/CoreArgParser.cpp @@ -47,7 +47,7 @@ void CoreArgParser::parse() } 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)) { diff --git a/src/unittests/common/SettingsTests.cpp b/src/unittests/common/SettingsTests.cpp index 78540dc67..3e2e565d7 100644 --- a/src/unittests/common/SettingsTests.cpp +++ b/src/unittests/common/SettingsTests.cpp @@ -16,9 +16,9 @@ void SettingsTests::initTestCase() oldSettings.remove(); } -void SettingsTests::setSettingFile() +void SettingsTests::setSettingsFile() { - Settings::setSettingFile(m_settingsFile); + Settings::setSettingsFile(m_settingsFile); } void SettingsTests::settingsFile() diff --git a/src/unittests/common/SettingsTests.h b/src/unittests/common/SettingsTests.h index 70cd3c74a..231870a2d 100644 --- a/src/unittests/common/SettingsTests.h +++ b/src/unittests/common/SettingsTests.h @@ -14,7 +14,7 @@ class SettingsTests : public QObject private Q_SLOTS: void initTestCase(); // Test are run in order top to bottom - void setSettingFile(); + void setSettingsFile(); void settingsFile(); void settingsPath(); void tlsDir(); diff --git a/src/unittests/deskflow/CoreArgParserTests.cpp b/src/unittests/deskflow/CoreArgParserTests.cpp index 7a02cee5a..fa1ed2a44 100644 --- a/src/unittests/deskflow/CoreArgParserTests.cpp +++ b/src/unittests/deskflow/CoreArgParserTests.cpp @@ -17,7 +17,7 @@ void CoreArgParserTests::initTestCase() if (oldSettings.exists()) oldSettings.remove(); - Settings::setSettingFile(m_settingsFile); + Settings::setSettingsFile(m_settingsFile); } void CoreArgParserTests::interfaceLong() diff --git a/src/unittests/gui/config/ScreenTests.cpp b/src/unittests/gui/config/ScreenTests.cpp index 66d3b1e87..e4702c150 100644 --- a/src/unittests/gui/config/ScreenTests.cpp +++ b/src/unittests/gui/config/ScreenTests.cpp @@ -19,7 +19,7 @@ void ScreenTests::initTestCase() if (oldSettings.exists()) oldSettings.remove(); - Settings::setSettingFile(m_settingsFile); + Settings::setSettingsFile(m_settingsFile); } void ScreenTests::basicFunctionality() diff --git a/src/unittests/legacytests/legacytests/main.cpp b/src/unittests/legacytests/legacytests/main.cpp index 583f4a41b..229439c7a 100644 --- a/src/unittests/legacytests/legacytests/main.cpp +++ b/src/unittests/legacytests/legacytests/main.cpp @@ -26,7 +26,7 @@ int main(int argc, char **argv) // HACK: Unit tests should not use the filesystem. std::filesystem::create_directories(testDir); - Settings::setSettingFile("tmp/test/settings.ini"); + Settings::setSettingsFile("tmp/test/settings.ini"); Settings::setValue(Settings::Server::ExternalConfig, true); ExitTimeout exitTimeout(1, "Unit tests");