properly rewind oidentd config file

[quassel.git] / src / core / coreapplication.cpp

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index ca0f527..f881d9e 100644 (file)
--- 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  *
@@ -22,11 +22,12 @@
 
 #include "core.h"
 #include "logger.h"
+#include <QDebug>
 
 CoreApplicationInternal::CoreApplicationInternal()
   : _coreCreated(false)
 {
-  Q_INIT_RESOURCE(sql);
+
 }
 
 CoreApplicationInternal::~CoreApplicationInternal() {
@@ -52,12 +53,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,12 +62,11 @@ 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()
+{
+#ifdef Q_OS_MAC
+  disableCrashhandler();
+#endif /* Q_OS_MAC */
 
   setRunMode(Quassel::CoreOnly);
   _internal = new CoreApplicationInternal();