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

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index 216601aa..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,56 +15,62 @@
  *   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"
 #include "coreapplication.h"
 #include "client.h"
-#include "clientsyncer.h"
 #include "core.h"
 #include "qtui.h"
 
+class InternalPeer;
+
 MonolithicApplication::MonolithicApplication(int &argc, char **argv)
-  : QtUiApplication(argc, 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);
+    _internal = new CoreApplicationInternal(); // needed for parser options
+#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
-    return false;
 
-  if(isOptionSet("port")) {
-    _internal->init();
-    _internalInitDone = true;
-  }
+bool MonolithicApplication::init()
+{
+    if (!QtUiApplication::init())
+        return false;
 
-  connect(Client::instance(), SIGNAL(newClientSyncer(ClientSyncer *)), this, SLOT(newClientSyncer(ClientSyncer *)));
-  return QtUiApplication::init();
-}
+    connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore()));
+
+    // If port is given, start core so it can listen to incoming connections
+    if (Quassel::isOptionSet("port")) {
+        startInternalCore();
+    }
 
-MonolithicApplication::~MonolithicApplication() {
-  // Client needs to be destroyed first
-  Client::destroy();
-  delete _internal;
+    return true;
 }
 
-void MonolithicApplication::newClientSyncer(ClientSyncer *syncer) {
-  connect(syncer, SIGNAL(startInternalCore(ClientSyncer *)), this, SLOT(startInternalCore(ClientSyncer *)));
+
+MonolithicApplication::~MonolithicApplication()
+{
+    // Client needs to be destroyed first
+    Client::destroy();
+    delete _internal;
 }
 
-void MonolithicApplication::startInternalCore(ClientSyncer *syncer) {
-  if(!_internalInitDone) {
-    _internal->init();
-    _internalInitDone = true;
-  }
-  Core *core = Core::instance();
-  connect(syncer, SIGNAL(connectToInternalCore(SignalProxy *)), core, SLOT(setupInternalClientSession(SignalProxy *)));
-  connect(core, SIGNAL(sessionState(const QVariant &)), syncer, SLOT(internalSessionStateReceived(const QVariant &)));
+
+void MonolithicApplication::startInternalCore()
+{
+    if (!_internalInitDone) {
+        _internal->init();
+        _internalInitDone = true;
+    }
+    Core *core = Core::instance();
+    CoreConnection *connection = Client::coreConnection();
+    connect(connection, SIGNAL(connectToInternalCore(InternalPeer*)), core, SLOT(setupInternalClientSession(InternalPeer*)));
+    connect(core, SIGNAL(sessionState(Protocol::SessionState)), connection, SLOT(internalSessionStateReceived(Protocol::SessionState)));
 }