From 5ee39c9b00ecca094be0ed5fab59bb27e5098a7a Mon Sep 17 00:00:00 2001 From: sithlord48 Date: Fri, 14 Mar 2025 00:08:58 -0400 Subject: [PATCH] refactor: Settings allow override file of settings/Deskflow.conf --- src/lib/common/Settings.cpp | 1 - src/lib/common/Settings.h | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/src/lib/common/Settings.cpp b/src/lib/common/Settings.cpp index 08d27afbf..676b5e630 100644 --- a/src/lib/common/Settings.cpp +++ b/src/lib/common/Settings.cpp @@ -31,7 +31,6 @@ void Settings::setSettingFile(const QString &settingsFile) Settings::Settings(QObject *parent) : QObject(parent) { - m_portableSettingsFile = QStringLiteral("settings.ini"); if (QFile(m_portableSettingsFile).exists()) { m_settings = new QSettings(m_portableSettingsFile, QSettings::IniFormat); qInfo().noquote() << "settings file:" << m_settings->fileName(); diff --git a/src/lib/common/Settings.h b/src/lib/common/Settings.h index 3f9513c03..97882da09 100644 --- a/src/lib/common/Settings.h +++ b/src/lib/common/Settings.h @@ -153,7 +153,7 @@ private: void initSettings(); QSettings *m_settings = nullptr; - QString m_portableSettingsFile = QStringLiteral("%1.conf").arg(kAppName); + QString m_portableSettingsFile = QStringLiteral("settings/%1.conf").arg(kAppName); // clang-format off inline static const QStringList m_logLevels = {