Sync caps, use signal/slot, CAP NEW/DEL, polish

[quassel.git] / src / common / main.cpp

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 6cbe438..69a95db 100644 (file)
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -103,13 +103,6 @@ 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
@@ -200,6 +193,13 @@ int main(int argc, char **argv)
     }
 #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
+
 #ifdef HAVE_KF5
     // FIXME: This should be done after loading the translation catalogue, but still in main()
     AboutData aboutData;