diff options
Diffstat (limited to 'src/core/Config.h')
-rw-r--r-- | src/core/Config.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/src/core/Config.h b/src/core/Config.h index 28a75082e..1c3f1e941 100644 --- a/src/core/Config.h +++ b/src/core/Config.h @@ -199,17 +199,18 @@ public: void resetToDefaults(); static Config* instance(); - static void createConfigFromFile(const QString& file); + static void createConfigFromFile(const QString& configFileName, const QString& localConfigFileName = {}); static void createTempFileInstance(); signals: void changed(ConfigKey key); private: - Config(const QString& fileName, QObject* parent = nullptr); + Config(const QString& configFileName, const QString& localConfigFileName, QObject* parent); explicit Config(QObject* parent); - void init(const QString& configFileName, const QString& localConfigFileName = ""); + void init(const QString& configFileName, const QString& localConfigFileName); void migrate(); + static QPair<QString, QString> defaultConfigFiles(); static QPointer<Config> m_instance; |