X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fuisupport%2Fuistyle.cpp;h=7482b93fb7a1ab6c8ac25db8187c6d71d69ef126;hp=72920ba13d01126c17d0bd994534a07ca1fe3450;hb=8014a388858e3f0cdc468898efa96cb192bb66a1;hpb=fdf19b3936b50b7cecad97d19a0c50346693c98a

diff --git a/src/uisupport/uistyle.cpp b/src/uisupport/uistyle.cpp
index 72920ba1..7482b93f 100644
--- a/src/uisupport/uistyle.cpp
+++ b/src/uisupport/uistyle.cpp
@@ -23,6 +23,10 @@
 #include "uistylesettings.h"
 #include "util.h"
 
+// FIXME remove with migration code
+#include <QSettings>
+#include "global.h"
+
 UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
   // register FormatList if that hasn't happened yet
   // FIXME I don't think this actually avoids double registration... then again... does it hurt?
@@ -32,6 +36,24 @@ UiStyle::UiStyle(const QString &settingsKey) : _settingsKey(settingsKey) {
     Q_ASSERT(QVariant::nameToType("UiStyle::FormatList") != QVariant::Invalid);
   }
 
+  // FIXME remove migration at some point
+  // We remove old settings if we find them, since they conflict
+#ifdef Q_WS_MAC
+  QSettings mys(QCoreApplication::organizationDomain(), Global::clientApplicationName);
+#else
+  QSettings mys(QCoreApplication::organizationName(), Global::clientApplicationName);
+#endif
+  mys.beginGroup("QtUi");
+  if(mys.childGroups().contains("Colors")) {
+    qDebug() << "Removing obsolete UiStyle settings!";
+    mys.endGroup();
+    mys.remove("Ui");
+    mys.remove("QtUiStyle");
+    mys.remove("QtUiStyleNew");
+    mys.remove("QtUi/Colors");
+    mys.sync();
+  }
+
   _defaultFont = QFont("Monospace", QApplication::font().pointSize());
 
   // Default format