X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsessionthread.h;h=e5c41c28fee44c8bc381478eac35f26e44873760;hp=b6c340a3821fed8a0cfbc14381f71f702115b022;hb=70f360989331414e89072122a038d1675b7581b0;hpb=efe20e20080a0c22e1a7b8b84ef622130dbf116e

diff --git a/src/core/sessionthread.h b/src/core/sessionthread.h
index b6c340a3..e5c41c28 100644
--- a/src/core/sessionthread.h
+++ b/src/core/sessionthread.h
@@ -18,8 +18,8 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _SESSIONTHREAD_H_
-#define _SESSIONTHREAD_H_
+#ifndef SESSIONTHREAD_H
+#define SESSIONTHREAD_H
 
 #include <QMutex>
 #include <QThread>
@@ -28,38 +28,44 @@
 
 class CoreSession;
 class QIODevice;
+class SignalProxy;
 
 class SessionThread : public QThread {
   Q_OBJECT
 
-  public:
-    SessionThread(UserId user, bool restoreState, QObject *parent = 0);
-    ~SessionThread();
+public:
+  SessionThread(UserId user, bool restoreState, QObject *parent = 0);
+  ~SessionThread();
 
-    void run();
+  void run();
 
-    CoreSession *session();
-    UserId user();
+  CoreSession *session();
+  UserId user();
 
-  public slots:
-    void addClient(QIODevice *socket);
+public slots:
+  void addClient(QObject *peer);
 
-  private slots:
-    void setSessionInitialized();
+private slots:
+  void setSessionInitialized();
 
-  signals:
-    void initialized();
-    void shutdown();
+signals:
+  void initialized();
+  void shutdown();
 
-  private:
-    CoreSession *_session;
-    UserId _user;
-    QList<QIODevice *> clientQueue;
-    bool _sessionInitialized;
-    bool _restoreState;
+  void addRemoteClient(QIODevice *);
+  void addInternalClient(SignalProxy *);
 
-    bool isSessionInitialized();
-    void addClientToSession(QIODevice *socket);
+private:
+  CoreSession *_session;
+  UserId _user;
+  QList<QObject *> clientQueue;
+  bool _sessionInitialized;
+  bool _restoreState;
+
+  bool isSessionInitialized();
+  void addClientToSession(QObject *peer);
+  void addRemoteClientToSession(QIODevice *socket);
+  void addInternalClientToSession(SignalProxy *proxy);
 };
 
 #endif