Reworking CliParser to allow building quasselcore always without KDE deps

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

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 9ad452e..5d373c9 100644 (file)
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -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();
 }