From: Manuel Nickschas <sputnick@quassel-irc.org>
Date: Mon, 16 Feb 2015 22:05:55 +0000 (+0100)
Subject: Migrate KDE-specific settings from KDE4 to KF5
X-Git-Tag: 0.12-beta1~11
X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=commitdiff_plain;h=99ae722f4f4b427698d07d6476b3b860da7fa09c

Migrate KDE-specific settings from KDE4 to KF5

This uses Kdelibs4ConfigMigrator to move over KDE-specific settings
(i.e. window state, shortcuts, notifications...) from the KDE4 config
dir to the one used by KF5. This should make the move seamless for
most intents and purposes.

Note that migration won't happen (again) once the KF5 config files
exist.
---

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 3f6cab54..6847371d 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -49,6 +49,7 @@
 #  include "kcmdlinewrapper.h"
 #elif defined HAVE_KF5
 #  include <KCoreAddons/KAboutData>
+#  include <KCoreAddons/Kdelibs4ConfigMigrator>
 #  include "qt5cliparser.h"
 #elif defined HAVE_QT5
 #  include "qt5cliparser.h"
@@ -102,6 +103,13 @@ int main(int argc, char **argv)
 # endif
 #endif
 
+    // Migrate settings from KDE4 to KF5 if appropriate
+#ifdef HAVE_KF5
+    Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName());
+    migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc");
+    migrator.migrate();
+#endif
+
     AbstractCliParser *cliParser;
 
 #ifdef HAVE_KDE4