Martchus
/
syncthingtray
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Don't use organization for settings

This commit is contained in:
Martchus 2017-02-20 19:41:34 +01:00
parent 57f7d140e0
commit 45905ca0f7
1 changed files with 10 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
tray/application/settings.cpp
View File

@ -1,5 +1,7 @@
#include "./settings.h" #include "./settings.h"
#include "resources/config.h"
#include <qtutilities/settingsdialog/qtsettings.h> #include <qtutilities/settingsdialog/qtsettings.h>
#ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS #ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS
# include <qtutilities/misc/dbusnotification.h> # include <qtutilities/misc/dbusnotification.h>
@ -11,6 +13,7 @@
#include <QSslCertificate> #include <QSslCertificate>
#include <QSslError> #include <QSslError>
#include <QMessageBox> #include <QMessageBox>
#include <QFile>
using namespace std; using namespace std;
using namespace Data; using namespace Data;
@ -33,7 +36,11 @@ Settings &values()
void restore() void restore()
{ {
QSettings settings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(), QApplication::applicationName()); QSettings settings(QSettings::IniFormat, QSettings::UserScope, QStringLiteral(PROJECT_NAME));
// move old config to new location
const QString oldConfig = QSettings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(), QApplication::applicationName()).fileName();
QFile::rename(oldConfig, settings.fileName()) || QFile::remove(oldConfig);
settings.sync();
Settings &v = values(); Settings &v = values();
settings.beginGroup(QStringLiteral("tray")); settings.beginGroup(QStringLiteral("tray"));
@ -121,7 +128,8 @@ void restore()
void save() void save()
{ {
QSettings settings(QSettings::IniFormat, QSettings::UserScope, QApplication::organizationName(), QApplication::applicationName()); QSettings settings(QSettings::IniFormat, QSettings::UserScope, QStringLiteral(PROJECT_NAME));
const Settings &v = values(); const Settings &v = values();
settings.beginGroup(QStringLiteral("tray")); settings.beginGroup(QStringLiteral("tray"));