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

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index b31d937b..e73a09fb 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -21,40 +21,6 @@
 #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)
@@ -64,18 +30,22 @@ CoreApplication::CoreApplication(int &argc, char **argv)
 #endif /* Q_OS_MAC */
 
     Quassel::setRunMode(Quassel::CoreOnly);
-    _internal = new CoreApplicationInternal();
 }
 
 
 CoreApplication::~CoreApplication()
 {
-    delete _internal;
+    _core.reset();
     Quassel::destroy();
 }
 
 
-bool CoreApplication::init()
+void CoreApplication::init()
 {
-    return Quassel::init() && _internal->init();
+    if (!Quassel::init()) {
+        throw ExitException{EXIT_FAILURE, tr("Could not initialize Quassel!")};
+    }
+
+    _core.reset(new Core{}); // FIXME C++14: std::make_unique
+    _core->init();
 }