X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.cpp;h=5d373c9632e4a2c60e3a62b0a4d3169608f4584c;hp=ca0f5273310cfe3b6a674be1a68257bfe718fe6c;hb=af5ee11e78a6c98f755d0cc5e3bef77028b227dd;hpb=6c826fb517e1431101ce15b82c451fc26957b89d diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp index ca0f5273..5d373c96 100644 --- a/src/core/coreapplication.cpp +++ b/src/core/coreapplication.cpp @@ -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; @@ -65,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(); }