reenabling the logging facility for all messagetypes
[quassel.git] / src / core / coreapplication.cpp
index 9ad452e..f0c84f3 100644 (file)
@@ -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;
@@ -62,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();
 }