#include "coreapplication.h"
#include "core.h"
+#include "logger.h"
-CoreApplicationInternal::CoreApplicationInternal() {
- // put core-only arguments here
- CliParser *parser = Quassel::cliParser();
- parser->addOption("port",'p', tr("The port quasselcore will listen at"), QString("4242"));
- parser->addSwitch("norestore", 'n', tr("Don't restore last core's state"));
- parser->addOption("logfile", 'l', tr("Path to logfile"));
- parser->addOption("loglevel", 'L', tr("Loglevel Debug|Info|Warning|Error"), "Info");
- parser->addOption("datadir", 0, tr("Specify the directory holding datafiles like the Sqlite DB and the SSL Cert"));
+CoreApplicationInternal::CoreApplicationInternal()
+ : _coreCreated(false)
+{
+ Q_INIT_RESOURCE(sql);
}
CoreApplicationInternal::~CoreApplicationInternal() {
- Core::saveState();
- Core::destroy();
+ if(_coreCreated) {
+ Core::saveState();
+ Core::destroy();
+ }
}
bool CoreApplicationInternal::init() {
}
Core::instance(); // create and init the core
+ _coreCreated = true;
- if(!Quassel::isOptionSet("norestore")) {
+ // if using KDE, option is called "restore" instead of "norestore"
+ if(Quassel::isOptionSet("restore") || !Quassel::isOptionSet("norestore"))
Core::restoreState();
- }
+
return true;
}
/*****************************************************************************/
-CoreApplication::CoreApplication(int &argc, char **argv) : QCoreApplication(argc, argv), Quassel() {
+CoreApplication::CoreApplication(int &argc, char **argv)
+#ifdef HAVE_KDE
+ : KApplication(false),
+#else
+ : QCoreApplication(argc, argv),
+#endif
+ Quassel()
+{
setRunMode(Quassel::CoreOnly);
_internal = new CoreApplicationInternal();
+
+ qInstallMsgHandler(Logger::logMessage);
}
CoreApplication::~CoreApplication() {