/***************************************************************************
- * 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 *
CoreApplicationInternal::CoreApplicationInternal()
: _coreCreated(false)
{
- Q_INIT_RESOURCE(sql);
- // 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() {
Core::instance(); // create and init the core
_coreCreated = true;
- if(!Quassel::isOptionSet("norestore")) {
+ if(!Quassel::isOptionSet("norestore"))
Core::restoreState();
- }
+
return true;
}
/*****************************************************************************/
CoreApplication::CoreApplication(int &argc, char **argv)
- : QCoreApplication(argc, argv),
- Quassel()
+ : QCoreApplication(argc, argv), Quassel()
{
+#ifdef Q_OS_MAC
+ disableCrashhandler();
+#endif /* Q_OS_MAC */
+
setRunMode(Quassel::CoreOnly);
_internal = new CoreApplicationInternal();
-
- qInstallMsgHandler(Logger::logMessage);
}
CoreApplication::~CoreApplication() {
}
bool CoreApplication::init() {
- if(Quassel::init())
- return _internal->init();
+ if(Quassel::init() && _internal->init()) {
+ qInstallMsgHandler(Logger::logMessage);
+ return true;
+ }
return false;
}