X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.cpp;h=ca0f5273310cfe3b6a674be1a68257bfe718fe6c;hp=7098ab89bfb105fca0a9ded3921c3206356f19fb;hb=a454ca7a22c1b3d9faf1f0fb8b1c9d7d0aa7847c;hpb=0f4d21d538c8cb4c8fb12cd285c4d7556714c2f3

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 7098ab89..ca0f5273 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -21,17 +21,12 @@
 #include "coreapplication.h"
 
 #include "core.h"
+#include "logger.h"
 
-CoreApplicationInternal::CoreApplicationInternal() 
+CoreApplicationInternal::CoreApplicationInternal()
   : _coreCreated(false)
 {
-  // put core-only arguments here
-  CliParser *parser = Quassel::cliParser();
-  parser->addOption("port",'p', tr("The port quasselcore will listen at"), QString("4242"));
-  parser->addSwitch("norestore", 'n', tr("Don't restore last core's state"));
-  parser->addOption("logfile", 'l', tr("Path to logfile"));
-  parser->addOption("loglevel", 'L', tr("Loglevel Debug|Info|Warning|Error"), "Info");
-  parser->addOption("datadir", 0, tr("Specify the directory holding datafiles like the Sqlite DB and the SSL Cert"));
+  Q_INIT_RESOURCE(sql);
 }
 
 CoreApplicationInternal::~CoreApplicationInternal() {
@@ -57,15 +52,27 @@ bool CoreApplicationInternal::init() {
   Core::instance();  // create and init the core
   _coreCreated = true;
 
-  if(!Quassel::isOptionSet("norestore")) {
+#ifdef HAVE_KDE
+  // if using KDE, option is called "restore" instead of "norestore"
+  if(Quassel::isOptionSet("restore"))
+#else
+  if(!Quassel::isOptionSet("norestore"))
+#endif
     Core::restoreState();
-  }
+
   return true;
 }
 
 /*****************************************************************************/
 
-CoreApplication::CoreApplication(int &argc, char **argv) : QCoreApplication(argc, argv), Quassel() {
+CoreApplication::CoreApplication(int &argc, char **argv)
+#ifdef HAVE_KDE
+: KApplication(false), Quassel() {
+  Q_UNUSED(argc); Q_UNUSED(argv);
+#else
+: QCoreApplication(argc, argv), Quassel() {
+#endif
+
   setRunMode(Quassel::CoreOnly);
   _internal = new CoreApplicationInternal();
 }
@@ -75,7 +82,9 @@ CoreApplication::~CoreApplication() {
 }
 
 bool CoreApplication::init() {
-  if(Quassel::init())
-    return _internal->init();
+  if(Quassel::init() && _internal->init()) {
+    qInstallMsgHandler(Logger::logMessage);
+    return true;
+  }
   return false;
 }