X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsessionthread.h;h=fee6e64f1da48aec638bf528600534d7e34998ca;hp=ee29d2e3dadcaff7c19973b7ff8e8e8cd2309134;hb=695758015a80eb8c158a9ac4c0f1c0b547e70df3;hpb=d1b6499b0b848d4287efae89107576548533502c

diff --git a/src/core/sessionthread.h b/src/core/sessionthread.h
index ee29d2e3..fee6e64f 100644
--- a/src/core/sessionthread.h
+++ b/src/core/sessionthread.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-08 by the Quassel IRC Team                         *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -15,11 +15,11 @@
  *   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_
-#define _SESSIONTHREAD_H_
+#ifndef SESSIONTHREAD_H
+#define SESSIONTHREAD_H
 
 #include <QMutex>
 #include <QThread>
@@ -27,13 +27,16 @@
 #include "types.h"
 
 class CoreSession;
+class InternalPeer;
+class RemotePeer;
 class QIODevice;
 
-class SessionThread : public QThread {
-  Q_OBJECT
+class SessionThread : public QThread
+{
+    Q_OBJECT
 
-  public:
-    SessionThread(UserId user, QObject *parent = 0);
+public:
+    SessionThread(UserId user, bool restoreState, QObject *parent = 0);
     ~SessionThread();
 
     void run();
@@ -41,23 +44,31 @@ class SessionThread : public QThread {
     CoreSession *session();
     UserId user();
 
-  public slots:
-    void addClient(QIODevice *socket);
+public slots:
+    void addClient(QObject *peer);
 
-  private slots:
+private slots:
     void setSessionInitialized();
 
-  signals:
+signals:
     void initialized();
+    void shutdown();
 
-  private:
+    void addRemoteClient(RemotePeer *peer);
+    void addInternalClient(InternalPeer *peer);
+
+private:
     CoreSession *_session;
     UserId _user;
-    QList<QIODevice *> clientQueue;
+    QList<QObject *> clientQueue;
     bool _sessionInitialized;
+    bool _restoreState;
 
     bool isSessionInitialized();
-    void addClientToSession(QIODevice *socket);
+    void addClientToSession(QObject *peer);
+    void addRemoteClientToSession(RemotePeer *remotePeer);
+    void addInternalClientToSession(InternalPeer *internalPeer);
 };
 
+
 #endif