uisupport: Provide helpers for dealing with widget changes

[quassel.git] / src / core / coreapplication.cpp

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index e73a09f..c8171dc 100644 (file)
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -18,34 +18,27 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#include "core.h"
 #include "coreapplication.h"
 
-
 CoreApplication::CoreApplication(int &argc, char **argv)
     : QCoreApplication(argc, argv)
 {
-#ifdef Q_OS_MAC
-    Quassel::disableCrashHandler();
-#endif /* Q_OS_MAC */
-
-    Quassel::setRunMode(Quassel::CoreOnly);
+    Quassel::registerQuitHandler([this]() {
+        connect(_core.get(), &Core::shutdownComplete, this, &CoreApplication::onShutdownComplete);
+        _core->shutdown();
+    });
 }
 
 
-CoreApplication::~CoreApplication()
+void CoreApplication::init()
 {
-    _core.reset();
-    Quassel::destroy();
+    _core = std::make_unique<Core>();
+    _core->init();
 }
 
 
-void CoreApplication::init()
+void CoreApplication::onShutdownComplete()
 {
-    if (!Quassel::init()) {
-        throw ExitException{EXIT_FAILURE, tr("Could not initialize Quassel!")};
-    }
-
-    _core.reset(new Core{}); // FIXME C++14: std::make_unique
-    _core->init();
+    connect(_core.get(), &QObject::destroyed, QCoreApplication::instance(), &QCoreApplication::quit);
+    _core.release()->deleteLater();
 }