# include "kcmdlinewrapper.h"
#elif defined HAVE_KF5
# include <KCoreAddons/KAboutData>
+# include <KCoreAddons/Kdelibs4ConfigMigrator>
# include "qt5cliparser.h"
#elif defined HAVE_QT5
# include "qt5cliparser.h"
# 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
cliParser->addSwitch("oidentd", 0, "Enable oidentd integration");
cliParser->addOption("oidentd-conffile", 0, "Set path to oidentd configuration file", "file");
#ifdef HAVE_SSL
- cliParser->addSwitch("require-ssl", 0, "Require SSL for client connections");
+ cliParser->addSwitch("require-ssl", 0, "Require SSL for remote (non-loopback) client connections");
#endif
cliParser->addSwitch("enable-experimental-dcc", 0, "Enable highly experimental and unfinished support for CTCP DCC (DANGEROUS)");
#endif
}
#endif
- if (!app.init())
- return EXIT_FAILURE;
-
#ifdef HAVE_KF5
// FIXME: This should be done after loading the translation catalogue, but still in main()
AboutData aboutData;
KAboutData::setApplicationData(aboutData.kAboutData());
#endif
+ if (!app.init())
+ return EXIT_FAILURE;
+
return app.exec();
}