X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmonoapplication.cpp;h=4b8fac41fac312df8dd0246ed42efe5324a6507e;hp=2592242cef23a62a0f95ec306005eeefc7576e60;hb=e7ca039bcfdef8e22946b4402643ce107e89709c;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index 2592242c..4b8fac41 100644
--- a/src/qtui/monoapplication.cpp
+++ b/src/qtui/monoapplication.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-09 by the Quassel Project                          *
+ *   Copyright (C) 2005-2016 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,7 +15,7 @@
  *   You should have received a copy of the GNU General Public License     *
  *   along with this program; if not, write to the                         *
  *   Free Software Foundation, Inc.,                                       *
- *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
+ *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
 #include "monoapplication.h"
@@ -24,30 +24,34 @@
 #include "core.h"
 #include "qtui.h"
 
+class InternalPeer;
+
 MonolithicApplication::MonolithicApplication(int &argc, char **argv)
     : QtUiApplication(argc, argv),
     _internalInitDone(false)
 {
     _internal = new CoreApplicationInternal(); // needed for parser options
-#if defined(HAVE_KDE) || defined(Q_OS_MAC)
-    disableCrashhandler();
-#endif /* HAVE_KDE || Q_OS_MAC */
-    setRunMode(Quassel::Monolithic);
+#if defined(HAVE_KDE4) || defined(Q_OS_MAC)
+    Quassel::disableCrashHandler();
+#endif /* HAVE_KDE4 || Q_OS_MAC */
+
+    Quassel::setRunMode(Quassel::Monolithic);
 }
 
 
 bool MonolithicApplication::init()
 {
-    if (!Quassel::init()) // parse args
+    if (!QtUiApplication::init())
         return false;
 
     connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore()));
 
-    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;
 }
 
 
@@ -67,6 +71,6 @@ void MonolithicApplication::startInternalCore()
     }
     Core *core = Core::instance();
     CoreConnection *connection = Client::coreConnection();
-    connect(connection, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *)));
-    connect(core, SIGNAL(sessionState(const QVariant &)), connection, SLOT(internalSessionStateReceived(const QVariant &)));
+    connect(connection, SIGNAL(connectToInternalCore(InternalPeer*)), core, SLOT(setupInternalClientSession(InternalPeer*)));
+    connect(core, SIGNAL(sessionState(Protocol::SessionState)), connection, SLOT(internalSessionStateReceived(Protocol::SessionState)));
 }