X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fcoreapplication.cpp;h=3056b8a7a2a61c0c518341155a5dcafc74aa885c;hb=1d5bd129c969612397795ad563d502c6cc4c578b;hp=ca0f5273310cfe3b6a674be1a68257bfe718fe6c;hpb=a454ca7a22c1b3d9faf1f0fb8b1c9d7d0aa7847c;p=quassel.git

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index ca0f5273..3056b8a7 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-09 by the Quassel Project                          *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -26,7 +26,7 @@
 CoreApplicationInternal::CoreApplicationInternal()
   : _coreCreated(false)
 {
-  Q_INIT_RESOURCE(sql);
+
 }
 
 CoreApplicationInternal::~CoreApplicationInternal() {
@@ -52,12 +52,7 @@ bool CoreApplicationInternal::init() {
   Core::instance();  // create and init the core
   _coreCreated = true;
 
-#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;
@@ -66,13 +61,8 @@ bool CoreApplicationInternal::init() {
 /*****************************************************************************/
 
 CoreApplication::CoreApplication(int &argc, char **argv)
-#ifdef HAVE_KDE
-: KApplication(false), Quassel() {
-  Q_UNUSED(argc); Q_UNUSED(argv);
-#else
-: QCoreApplication(argc, argv), Quassel() {
-#endif
-
+  : QCoreApplication(argc, argv), Quassel()
+{
   setRunMode(Quassel::CoreOnly);
   _internal = new CoreApplicationInternal();
 }
@@ -83,7 +73,7 @@ CoreApplication::~CoreApplication() {
 
 bool CoreApplication::init() {
   if(Quassel::init() && _internal->init()) {
-    qInstallMsgHandler(Logger::logMessage);
+    // qInstallMsgHandler(Logger::logMessage);
     return true;
   }
   return false;