X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.cpp;h=f0c84f32480446e03917f3aacd392581c530ed32;hp=9ad452ed78e6ec24fb2995844288147d383345b3;hb=e497bef2a6bd36874192ebef7fd1899ce28f7c9c;hpb=96c9508110f38a19be161652ea888c7d61ba279b diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp index 9ad452ed..f0c84f32 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; @@ -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(); }