From 45905ca0f761e6c3c2e88932b34e8c87b8ab1415 Mon Sep 17 00:00:00 2001
From: Martchus <martchus@gmx.net>
Date: Mon, 20 Feb 2017 19:41:34 +0100
Subject: [PATCH] Don't use organization for settings

---
 tray/application/settings.cpp | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/tray/application/settings.cpp b/tray/application/settings.cpp
index 6736a94..8d79935 100644
--- a/tray/application/settings.cpp
+++ b/tray/application/settings.cpp
@@ -1,5 +1,7 @@
 #include "./settings.h"
 
+#include "resources/config.h"
+
 #include <qtutilities/settingsdialog/qtsettings.h>
 #ifdef QT_UTILITIES_SUPPORT_DBUS_NOTIFICATIONS
 # include <qtutilities/misc/dbusnotification.h>
@@ -11,6 +13,7 @@
 #include <QSslCertificate>
 #include <QSslError>
 #include <QMessageBox>
+#include <QFile>
 
 using namespace std;
 using namespace Data;
@@ -33,7 +36,11 @@ Settings &values()
 
 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.beginGroup(QStringLiteral("tray"));
@@ -121,7 +128,8 @@ void restore()
 
 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();
 
     settings.beginGroup(QStringLiteral("tray"));