/***************************************************************************
- * Copyright (C) 2005-2018 by the Quassel Project *
+ * Copyright (C) 2005-2020 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
* 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. *
***************************************************************************/
-#include "core.h"
#include "coreapplication.h"
-CoreApplicationInternal::CoreApplicationInternal()
- : _coreCreated(false)
-{
-}
-
-
-CoreApplicationInternal::~CoreApplicationInternal()
-{
- if (_coreCreated) {
- Core::saveState();
- Core::destroy();
- }
-}
-
-
-bool CoreApplicationInternal::init()
-{
- Core::instance(); // create and init the core
- _coreCreated = true;
-
- Quassel::registerReloadHandler([]() {
- // Currently, only reloading SSL certificates and the sysident cache is supported
- Core::cacheSysIdent();
- return Core::reloadCerts();
- });
-
- if (!Quassel::isOptionSet("norestore"))
- Core::restoreState();
-
- return true;
-}
-
-
-/*****************************************************************************/
-
-CoreApplication::CoreApplication(int &argc, char **argv)
+CoreApplication::CoreApplication(int& argc, char** argv)
: QCoreApplication(argc, argv)
{
-#ifdef Q_OS_MAC
- Quassel::disableCrashHandler();
-#endif /* Q_OS_MAC */
-
- Quassel::setRunMode(Quassel::CoreOnly);
- _internal = new CoreApplicationInternal();
+ Quassel::registerQuitHandler([this]() {
+ connect(_core.get(), &Core::shutdownComplete, this, &CoreApplication::onShutdownComplete);
+ _core->shutdown();
+ });
}
-
-CoreApplication::~CoreApplication()
+void CoreApplication::init()
{
- delete _internal;
- Quassel::destroy();
+ _core = std::make_unique<Core>();
+ _core->init();
}
-
-bool CoreApplication::init()
+void CoreApplication::onShutdownComplete()
{
- return Quassel::init() && _internal->init();
+ connect(_core.get(), &QObject::destroyed, QCoreApplication::instance(), &QCoreApplication::quit);
+ _core.release()->deleteLater();
}