X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsessionthread.cpp;h=997d194207119663849a36640105a88f02d7ab3f;hp=6cd2b70d3a356b92be7605e637fc6849d4fafdd5;hb=dba66762993507168b1a3de25cfd2d7bff0ff969;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce

diff --git a/src/core/sessionthread.cpp b/src/core/sessionthread.cpp
index 6cd2b70d..997d1942 100644
--- a/src/core/sessionthread.cpp
+++ b/src/core/sessionthread.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,15 +15,15 @@
  *   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 <QMutexLocker>
-
+#include "core.h"
+#include "coresession.h"
+#include "internalpeer.h"
+#include "remotepeer.h"
 #include "sessionthread.h"
 #include "signalproxy.h"
-#include "coresession.h"
-#include "core.h"
 
 SessionThread::SessionThread(UserId uid, bool restoreState, QObject *parent)
     : QThread(parent),
@@ -72,6 +72,7 @@ void SessionThread::setSessionInitialized()
 }
 
 
+// this and the following related methods are executed in the Core thread!
 void SessionThread::addClient(QObject *peer)
 {
     if (isSessionInitialized()) {
@@ -85,42 +86,44 @@ void SessionThread::addClient(QObject *peer)
 
 void SessionThread::addClientToSession(QObject *peer)
 {
-    QIODevice *socket = qobject_cast<QIODevice *>(peer);
-    if (socket) {
-        addRemoteClientToSession(socket);
+    RemotePeer *remote = qobject_cast<RemotePeer *>(peer);
+    if (remote) {
+        addRemoteClientToSession(remote);
         return;
     }
 
-    SignalProxy *proxy = qobject_cast<SignalProxy *>(peer);
-    if (proxy) {
-        addInternalClientToSession(proxy);
+    InternalPeer *internal = qobject_cast<InternalPeer *>(peer);
+    if (internal) {
+        addInternalClientToSession(internal);
         return;
     }
 
-    qWarning() << "SessionThread::addClient() received neither QIODevice nor SignalProxy as peer!" << peer;
+    qWarning() << "SessionThread::addClient() received invalid peer!" << peer;
 }
 
 
-void SessionThread::addRemoteClientToSession(QIODevice *socket)
+void SessionThread::addRemoteClientToSession(RemotePeer *remotePeer)
 {
-    socket->setParent(0);
-    socket->moveToThread(session()->thread());
-    emit addRemoteClient(socket);
+    remotePeer->setParent(0);
+    remotePeer->moveToThread(session()->thread());
+    emit addRemoteClient(remotePeer);
 }
 
 
-void SessionThread::addInternalClientToSession(SignalProxy *proxy)
+void SessionThread::addInternalClientToSession(InternalPeer *internalPeer)
 {
-    emit addInternalClient(proxy);
+    internalPeer->setParent(0);
+    internalPeer->moveToThread(session()->thread());
+    emit addInternalClient(internalPeer);
 }
 
 
 void SessionThread::run()
 {
     _session = new CoreSession(user(), _restoreState);
-    connect(this, SIGNAL(addRemoteClient(QIODevice *)), _session, SLOT(addClient(QIODevice *)));
-    connect(this, SIGNAL(addInternalClient(SignalProxy *)), _session, SLOT(addClient(SignalProxy *)));
-    connect(_session, SIGNAL(sessionState(const QVariant &)), Core::instance(), SIGNAL(sessionState(const QVariant &)));
+    connect(this, SIGNAL(addRemoteClient(RemotePeer*)), _session, SLOT(addClient(RemotePeer*)));
+    connect(this, SIGNAL(addInternalClient(InternalPeer*)), _session, SLOT(addClient(InternalPeer*)));
+    connect(_session, SIGNAL(sessionState(Protocol::SessionState)), Core::instance(), SIGNAL(sessionState(Protocol::SessionState)));
     emit initialized();
     exec();
     delete _session;