X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fqtui%2Fmonoapplication.cpp;h=5eb3a5cbb36db44b5b318e15b97fbaefc6cffb59;hp=60df4c5b94c3a367dd8a4808acee58f8f799b716;hb=8fe8accd73abf77ab21d2d1c1346d2bc5c4de2ff;hpb=1d9dfeff6b2531ff99e0d12669b3a1dae393e768

diff --git a/src/qtui/monoapplication.cpp b/src/qtui/monoapplication.cpp
index 60df4c5b..5eb3a5cb 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,41 +24,62 @@
 #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)
+    disableCrashhandler();
+#endif /* HAVE_KDE4 || Q_OS_MAC */
+    setRunMode(Quassel::Monolithic);
 }
 
-bool MonolithicApplication::init() {
-  if(!Quassel::init()) // parse args
-    return false;
 
-  if(isOptionSet("port")) {
-    _internal->init();
-    _internalInitDone = true;
-  }
+bool MonolithicApplication::init()
+{
+    if (!Quassel::init()) // parse args
+        return false;
+
+    connect(Client::coreConnection(), SIGNAL(startInternalCore()), SLOT(startInternalCore()));
+
+    // FIXME what's this for?
+    if (isOptionSet("port")) {
+        startInternalCore();
+    }
+
+    return QtUiApplication::init();
+}
+
 
-  return QtUiApplication::init();
+MonolithicApplication::~MonolithicApplication()
+{
+    // Client needs to be destroyed first
+    Client::destroy();
+    delete _internal;
 }
 
-MonolithicApplication::~MonolithicApplication() {
-  // Client needs to be destroyed first
-  Client::destroy();
-  delete _internal;
+
+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)));
 }
 
-void MonolithicApplication::startInternalCore() {
-  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 &)));
+
+bool MonolithicApplication::reloadConfig()
+{
+    if (_internal) {
+        return _internal->reloadConfig();
+    } else {
+        return false;
+    }
 }