X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsessionthread.h;h=0307ad29b86a8befeda5a51c89f0e4eaf05effe2;hp=810e858300939de769f18f82f1681c819866c569;hb=dba66762993507168b1a3de25cfd2d7bff0ff969;hpb=f824db0e31b54969e0b7fa0b5405b1e9173d482c

diff --git a/src/core/sessionthread.h b/src/core/sessionthread.h
index 810e8583..0307ad29 100644
--- a/src/core/sessionthread.h
+++ b/src/core/sessionthread.h
@@ -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.         *
  ***************************************************************************/
 
 #ifndef SESSIONTHREAD_H
@@ -27,45 +27,48 @@
 #include "types.h"
 
 class CoreSession;
+class InternalPeer;
+class RemotePeer;
 class QIODevice;
-class SignalProxy;
 
-class SessionThread : public QThread {
-  Q_OBJECT
+class SessionThread : public QThread
+{
+    Q_OBJECT
 
 public:
-  SessionThread(UserId user, bool restoreState, QObject *parent = 0);
-  ~SessionThread();
+    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(QObject *peer);
+    void addClient(QObject *peer);
 
 private slots:
-  void setSessionInitialized();
+    void setSessionInitialized();
 
 signals:
-  void initialized();
-  void shutdown();
+    void initialized();
+    void shutdown();
 
-  void addRemoteClient(QIODevice *);
-  void addInternalClient(SignalProxy *);
+    void addRemoteClient(RemotePeer *peer);
+    void addInternalClient(InternalPeer *peer);
 
 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);
+    CoreSession *_session;
+    UserId _user;
+    QList<QObject *> clientQueue;
+    bool _sessionInitialized;
+    bool _restoreState;
+
+    bool isSessionInitialized();
+    void addClientToSession(QObject *peer);
+    void addRemoteClientToSession(RemotePeer *remotePeer);
+    void addInternalClientToSession(InternalPeer *internalPeer);
 };
 
+
 #endif