/***************************************************************************
- * Copyright (C) 2005-08 by the Quassel IRC Team *
+ * Copyright (C) 2005-2018 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* You should have received a copy of the GNU General Public License *
* along with this program; if not, write to the *
* Free Software Foundation, Inc., *
- * 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
#include "coreapplication.h"
-#include "core.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() {
- Core::saveState();
- Core::destroy();
-}
-
-bool CoreApplicationInternal::init() {
- /* FIXME
- This is an initial check if logfile is writable since the warning would spam stdout if done
- in current Logger implementation. Can be dropped whenever the logfile is only opened once.
- */
- QFile logFile;
- if(!Quassel::optionValue("logfile").isEmpty()) {
- logFile.setFileName(Quassel::optionValue("logfile"));
- if(!logFile.open(QIODevice::Append | QIODevice::Text))
- qWarning("Warning: Couldn't open logfile '%s' - will log to stdout instead",qPrintable(logFile.fileName()));
- else logFile.close();
- }
-
- Core::instance(); // create and init the core
-
- if(!Quassel::isOptionSet("norestore")) {
- Core::restoreState();
- }
- return true;
+CoreApplication::CoreApplication(int &argc, char **argv)
+ : QCoreApplication(argc, argv)
+{
+ Quassel::registerQuitHandler([this]() {
+ connect(_core.get(), SIGNAL(shutdownComplete()), this, SLOT(onShutdownComplete()));
+ _core->shutdown();
+ });
}
-/*****************************************************************************/
-CoreApplication::CoreApplication(int &argc, char **argv) : QCoreApplication(argc, argv), Quassel() {
- setRunMode(Quassel::CoreOnly);
- _internal = new CoreApplicationInternal();
+void CoreApplication::init()
+{
+ _core.reset(new Core{}); // FIXME C++14: std::make_unique
+ _core->init();
}
-CoreApplication::~CoreApplication() {
- delete _internal;
-}
-bool CoreApplication::init() {
- if(Quassel::init())
- return _internal->init();
- return false;
+void CoreApplication::onShutdownComplete()
+{
+ connect(_core.get(), SIGNAL(destroyed()), QCoreApplication::instance(), SLOT(quit()));
+ _core.release()->deleteLater();
}