X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.cpp;h=06de578e5dcb5a8cec03f26d800fa17299bca23f;hb=8af8cee61754657c07a6240c3a8761afc86929b2;hp=9ad452ed78e6ec24fb2995844288147d383345b3;hpb=96c9508110f38a19be161652ea888c7d61ba279b;p=quassel.git

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 9ad452ed..06de578e 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,8 +52,7 @@ bool CoreApplicationInternal::init() {
   Core::instance();  // create and init the core
   _coreCreated = true;
 
-  // if using KDE, option is called "restore" instead of "norestore"
-  if(Quassel::isOptionSet("restore") || !Quassel::isOptionSet("norestore"))
+  if(!Quassel::isOptionSet("norestore"))
     Core::restoreState();
 
   return true;
@@ -61,14 +60,7 @@ 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
-
+CoreApplication::CoreApplication(int &argc, char **argv) : QCoreApplication(argc, argv), Quassel() {
   setRunMode(Quassel::CoreOnly);
   _internal = new CoreApplicationInternal();
 }