X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fqtui%2Fmonoapplication.cpp;h=4b8fac41fac312df8dd0246ed42efe5324a6507e;hb=106526817f753cdd680c783fc58968d5111d16eb;hp=5eb3a5cbb36db44b5b318e15b97fbaefc6cffb59;hpb=25a3ae50ac0d9835283e4f5f10fcfcc10ed5575d;p=quassel.git

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index 5eb3a5cb..4b8fac41 100644
--- a/src/qtui/monoapplication.cpp
+++ b/src/qtui/monoapplication.cpp
@@ -32,25 +32,26 @@ MonolithicApplication::MonolithicApplication(int &argc, char **argv)
 {
     _internal = new CoreApplicationInternal(); // needed for parser options
 #if defined(HAVE_KDE4) || defined(Q_OS_MAC)
-    disableCrashhandler();
+    Quassel::disableCrashHandler();
 #endif /* HAVE_KDE4 || Q_OS_MAC */
-    setRunMode(Quassel::Monolithic);
+
+    Quassel::setRunMode(Quassel::Monolithic);
 }
 
 
 bool MonolithicApplication::init()
 {
-    if (!Quassel::init()) // parse args
+    if (!QtUiApplication::init())
         return false;
 
     connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore()));
 
-    // FIXME what's this for?
-    if (isOptionSet("port")) {
+    // If port is given, start core so it can listen to incoming connections
+    if (Quassel::isOptionSet("port")) {
         startInternalCore();
     }
 
-    return QtUiApplication::init();
+    return true;
 }
 
 
@@ -73,13 +74,3 @@ void MonolithicApplication::startInternalCore()
     connect(connection, SIGNAL(connectToInternalCore(InternalPeer*)), core, SLOT(setupInternalClientSession(InternalPeer*)));
     connect(core, SIGNAL(sessionState(Protocol::SessionState)), connection, SLOT(internalSessionStateReceived(Protocol::SessionState)));
 }
-
-
-bool MonolithicApplication::reloadConfig()
-{
-    if (_internal) {
-        return _internal->reloadConfig();
-    } else {
-        return false;
-    }
-}