X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.cpp;h=50670ea96f916a65179090fdbc3b93e8616c2656;hp=0f6bb95ff0eb0a62c8945d924a6af83c94ad4cb5;hb=HEAD;hpb=c015fbf8afaf64fbb5a8e2122e2a1ecf0325b1a1;ds=sidebyside

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 0f6bb95f..50670ea9 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 by the Quassel Project                        *
+ *   Copyright (C) 2005-2022 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -20,30 +20,23 @@
 
 #include "coreapplication.h"
 
-CoreApplication::CoreApplication(int &argc, char **argv)
+CoreApplication::CoreApplication(int& argc, char** argv)
     : QCoreApplication(argc, argv)
 {
-    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();
 }