aly/servatrice
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Fix configuration loading

Browse source
This commit is contained in:
Fabio Bas 2014-10-04 10:33:55 +02:00
parent 871f5f7c94
commit 0261862b1b
3 changed files with 8 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
servatrice/src/main.cpp
View file

@ -166,7 +166,7 @@ int main(int argc, char *argv[])
configPath = SettingsCache::guessConfigurationPath(configPath); configPath = SettingsCache::guessConfigurationPath(configPath);
qWarning() << "Using configuration file: " << configPath; qWarning() << "Using configuration file: " << configPath;
settingsCache = new SettingsCache(); settingsCache = new SettingsCache(configPath);
loggerThread = new QThread; loggerThread = new QThread;
loggerThread->setObjectName("logger"); loggerThread->setObjectName("logger");

6
servatrice/src/settingscache.cpp
View file

@ -7,6 +7,12 @@
#include <QDesktopServices> #include <QDesktopServices>
#endif #endif
SettingsCache::SettingsCache(const QString & fileName, QSettings::Format format, QObject * parent)
:QSettings(fileName, format, parent)
{
}
QString SettingsCache::guessConfigurationPath(QString & specificPath) QString SettingsCache::guessConfigurationPath(QString & specificPath)
{ {
const QString fileName="servatrice.ini"; const QString fileName="servatrice.ini";

2
servatrice/src/settingscache.h
View file

@ -9,7 +9,7 @@ class SettingsCache : public QSettings {
private: private:
QSettings *settings; QSettings *settings;
public: public:
SettingsCache(const QString & fileName="servatrice.ini", QSettings::Format format=QSettings::IniFormat, QObject * parent = 0) { }; SettingsCache(const QString & fileName="servatrice.ini", QSettings::Format format=QSettings::IniFormat, QObject * parent = 0);
static QString guessConfigurationPath(QString & specificPath); static QString guessConfigurationPath(QString & specificPath);
}; };