X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fmain.cpp;h=9c468fda7b95e712d9fab5d095c21a283233896f;hp=1f556240e9d1aea33ed87f00e8964b8d8cd860e4;hb=af5ee11e78a6c98f755d0cc5e3bef77028b227dd;hpb=965183188ee726036685fcba379c2559bd183247

diff --git a/src/common/main.cpp b/src/common/main.cpp
index 1f556240..9c468fda 100644
--- a/src/common/main.cpp
+++ b/src/common/main.cpp
@@ -20,11 +20,6 @@
 
 #include <cstdlib>
 
-#ifdef HAVE_KDE
-#  include <KCmdLineArgs>
-#  include <KAboutData>
-#endif
-
 #ifdef BUILD_CORE
 #  include "coreapplication.h"
 #elif defined BUILD_QTUI
@@ -36,9 +31,21 @@
 #error "Something is wrong - you need to #define a build mode!"
 #endif
 
+// We don't want quasselcore to depend on KDE
+#if defined HAVE_KDE && defined BUILD_CORE
+#  undef HAVE_KDE
+#endif
+
+#ifdef HAVE_KDE
+#  include <KAboutData>
+#  include "kcmdlinewrapper.h"
+#endif
+
+#include "cliparser.h"
 #include "quassel.h"
 
 int main(int argc, char **argv) {
+  Q_INIT_RESOURCE(i18n);
 
   // Setup build information and version string
   # include "version.gen"
@@ -48,17 +55,26 @@ int main(int argc, char **argv) {
   QCoreApplication::setOrganizationName(Quassel::buildInfo().organizationName);
   QCoreApplication::setOrganizationDomain(Quassel::buildInfo().organizationDomain);
 
+  AbstractCliParser *cliParser;
+
 #ifdef HAVE_KDE
   // We need to init KCmdLineArgs first
-  // TODO: build an AboutData class to replace our aboutDlg strings
-  KAboutData aboutData(argv[0], 0, ki18n("Quassel IRC"), Quassel::buildInfo().plainVersionString.toUtf8());
+  // TODO: build an AboutData compat class to replace our aboutDlg strings
+  KAboutData aboutData("quassel", "kdelibs4", ki18n("Quassel IRC"), Quassel::buildInfo().plainVersionString.toUtf8(),
+                        ki18n("A modern, distributed IRC client"));
+  aboutData.addLicense(KAboutData::License_GPL_V2);
+  aboutData.addLicense(KAboutData::License_GPL_V3);
   aboutData.setOrganizationDomain(Quassel::buildInfo().organizationDomain.toUtf8());
   KCmdLineArgs::init(argc, argv, &aboutData);
+
+  cliParser = new KCmdLineWrapper();
+#else
+  cliParser = new CliParser();
 #endif
+  Quassel::setCliParser(cliParser);
 
   // Initialize CLI arguments
   // NOTE: We can't use tr() at this point, since app is not yet created
-  CliParser *cliParser = Quassel::cliParser();
 
   // put shared client&core arguments here
   cliParser->addSwitch("debug",'d', "Enable debug output");