X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.cpp;h=9e7f03fdf0dad8ea5941e85d1a1a82528145b4a5;hp=25dd6851392bc0899cdcac145ff7ec8447fc96fd;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=6422c61b11d97f905b6a27f2d280e9ec0d8bb3e2

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 25dd6851..9e7f03fd 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -20,84 +20,23 @@
 
 #include "coreapplication.h"
 
-#include "core.h"
-#include "logger.h"
-
-CoreApplicationInternal::CoreApplicationInternal()
-    : _coreCreated(false)
-{
-}
-
-
-CoreApplicationInternal::~CoreApplicationInternal()
-{
-    if (_coreCreated) {
-        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
-    _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()
 {
-    if (Quassel::init() && _internal->init()) {
-#if QT_VERSION < 0x050000
-        qInstallMsgHandler(Logger::logMessage);
-#else
-        qInstallMessageHandler(Logger::logMessage);
-#endif
-        return true;
-    }
-    return false;
+    connect(_core.get(), &QObject::destroyed, QCoreApplication::instance(), &QCoreApplication::quit);
+    _core.release()->deleteLater();
 }