X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.cpp;h=9e7f03fdf0dad8ea5941e85d1a1a82528145b4a5;hb=db00831bca59a012242d1ad5fac52a20c6cd2956;hp=9ad6ef093b24fc4eb8c06604798fad20a1875559;hpb=ddfb1d2574c4bffd180361a80df9b1cd584bb040;p=quassel.git

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 9ad6ef09..9e7f03fd 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -20,34 +20,23 @@
 
 #include "coreapplication.h"
 
-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);
     Quassel::registerQuitHandler([this]() {
-        connect(_core.get(), SIGNAL(shutdownComplete()), this, SLOT(onShutdownComplete()));
+        connect(_core.get(), &Core::shutdownComplete, this, &CoreApplication::onShutdownComplete);
         _core->shutdown();
     });
 }
 
-
 void CoreApplication::init()
 {
-    if (!Quassel::init()) {
-        throw ExitException{EXIT_FAILURE, tr("Could not initialize Quassel!")};
-    }
-
-    _core.reset(new Core{}); // FIXME C++14: std::make_unique
+    _core = std::make_unique<Core>();
     _core->init();
 }
 
-
 void CoreApplication::onShutdownComplete()
 {
-    connect(_core.get(), SIGNAL(destroyed()), QCoreApplication::instance(), SLOT(quit()));
+    connect(_core.get(), &QObject::destroyed, QCoreApplication::instance(), &QCoreApplication::quit);
     _core.release()->deleteLater();
 }