X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;ds=sidebyside;f=src%2Fcore%2Fsessionthread.h;h=c215590f5498771e4782168f6167bd1a35b672f4;hb=5fc6f7e2d63b45770574260afd6ce535e9548d23;hp=34c8ed67d5c5cc347450f2b4cb258b158b4b707e;hpb=694f9bfbf7f1af19108461c7e00d133e55082bce;p=quassel.git diff --git a/src/core/sessionthread.h b/src/core/sessionthread.h index 34c8ed67..c215590f 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-2018 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,15 +27,16 @@ #include "types.h" class CoreSession; +class InternalPeer; +class RemotePeer; class QIODevice; -class SignalProxy; class SessionThread : public QThread { Q_OBJECT public: - SessionThread(UserId user, bool restoreState, QObject *parent = 0); + SessionThread(UserId user, bool restoreState, bool strictIdentEnabled, QObject *parent = 0); ~SessionThread(); void run(); @@ -53,8 +54,8 @@ signals: void initialized(); void shutdown(); - void addRemoteClient(QIODevice *); - void addInternalClient(SignalProxy *); + void addRemoteClient(RemotePeer *peer); + void addInternalClient(InternalPeer *peer); private: CoreSession *_session; @@ -63,10 +64,13 @@ private: bool _sessionInitialized; bool _restoreState; + /// Whether or not strict ident mode is enabled, locking users' idents to Quassel username + bool _strictIdentEnabled; + bool isSessionInitialized(); void addClientToSession(QObject *peer); - void addRemoteClientToSession(QIODevice *socket); - void addInternalClientToSession(SignalProxy *proxy); + void addRemoteClientToSession(RemotePeer *remotePeer); + void addInternalClientToSession(InternalPeer *internalPeer); };