X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.cpp;h=d662820c774a8dc4009704dbbc2d495dfa3b1fcd;hp=b31d937b22ea366ce3281f7db6c23bd983616636;hb=c194ed5fb3d15e14b9364f9796d3521910dc72fe;hpb=f9e037ea6a0b946c84db62d324996d8f878c1efb

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index b31d937b..d662820c 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -18,64 +18,27 @@
  *   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)
     : 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(), SIGNAL(shutdownComplete()), this, SLOT(onShutdownComplete()));
+        _core->shutdown();
+    });
 }
 
 
-CoreApplication::~CoreApplication()
+void CoreApplication::init()
 {
-    delete _internal;
-    Quassel::destroy();
+    _core.reset(new Core{}); // FIXME C++14: std::make_unique
+    _core->init();
 }
 
 
-bool CoreApplication::init()
+void CoreApplication::onShutdownComplete()
 {
-    return Quassel::init() && _internal->init();
+    connect(_core.get(), SIGNAL(destroyed()), QCoreApplication::instance(), SLOT(quit()));
+    _core.release()->deleteLater();
 }