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

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 7098ab89..5d373c96 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,9 +52,9 @@ bool CoreApplicationInternal::init() {
   Core::instance();  // create and init the core
   _coreCreated = true;
 
-  if(!Quassel::isOptionSet("norestore")) {
+  if(!Quassel::isOptionSet("norestore"))
     Core::restoreState();
-  }
+
   return true;
 }
 
@@ -75,7 +70,9 @@ CoreApplication::~CoreApplication() {
 }
 
 bool CoreApplication::init() {
-  if(Quassel::init())
-    return _internal->init();
+  if(Quassel::init() && _internal->init()) {
+    qInstallMsgHandler(Logger::logMessage);
+    return true;
+  }
   return false;
 }