X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoreapplication.cpp;h=1a689a22fcf25790f5043df10e6b741fd46f59a1;hp=7426f1773a2e29b5abd462c33308a43e39d31a09;hb=b5dfd31e3d1ad7ca4bfe8262b62be259f6dc786a;hpb=6fdf05d0d6b411370f3a7cd5f8ee8cb6ea6ff324

diff --git a/src/core/coreapplication.cpp b/src/core/coreapplication.cpp
index 7426f177..1a689a22 100644
--- a/src/core/coreapplication.cpp
+++ b/src/core/coreapplication.cpp
@@ -55,6 +55,11 @@ bool CoreApplicationInternal::init()
     Core::instance(); // create and init the core
     _coreCreated = true;
 
+    Quassel::registerReloadHandler([]() {
+        // Currently, only reloading SSL certificates is supported
+        return Core::reloadCerts();
+    });
+
     if (!Quassel::isOptionSet("norestore"))
         Core::restoreState();
 
@@ -62,27 +67,16 @@ bool CoreApplicationInternal::init()
 }
 
 
-bool CoreApplicationInternal::reloadConfig()
-{
-    if (_coreCreated) {
-        // Currently, only reloading SSL certificates is supported
-        return Core::reloadCerts();
-    } else {
-        return false;
-    }
-}
-
-
 /*****************************************************************************/
 
 CoreApplication::CoreApplication(int &argc, char **argv)
-    : QCoreApplication(argc, argv), Quassel()
+    : QCoreApplication(argc, argv)
 {
 #ifdef Q_OS_MAC
-    disableCrashhandler();
+    Quassel::disableCrashHandler();
 #endif /* Q_OS_MAC */
 
-    setRunMode(Quassel::CoreOnly);
+    Quassel::setRunMode(Quassel::CoreOnly);
     _internal = new CoreApplicationInternal();
 }
 
@@ -105,13 +99,3 @@ bool CoreApplication::init()
     }
     return false;
 }
-
-
-bool CoreApplication::reloadConfig()
-{
-    if (_internal) {
-        return _internal->reloadConfig();
-    } else {
-        return false;
-    }
-}