X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsessionthread.h;h=98f6a50c2fde006df64a39415fcc34b08b74f0e1;hp=9a4a1b6b851818c73585da5bc3a8f1ac189ae10d;hb=8961f348947fc55cc4bc769563684af3f2ea7ccc;hpb=eaa1bd30bc088e5cae6d8a742d7aedb3d8ff1897

diff --git a/src/core/sessionthread.h b/src/core/sessionthread.h
index 9a4a1b6b..98f6a50c 100644
--- a/src/core/sessionthread.h
+++ b/src/core/sessionthread.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2015 by the Quassel Project                        *
+ *   Copyright (C) 2005-2019 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,59 +18,45 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef SESSIONTHREAD_H
-#define SESSIONTHREAD_H
+#pragma once
+
+#include <memory>
 
-#include <QMutex>
 #include <QThread>
 
 #include "types.h"
 
 class CoreSession;
+class Peer;
 class InternalPeer;
 class RemotePeer;
-class QIODevice;
 
-class SessionThread : public QThread
+class SessionThread : public QObject
 {
     Q_OBJECT
 
 public:
-    SessionThread(UserId user, bool restoreState, QObject *parent = 0);
-    ~SessionThread();
-
-    void run();
-
-    CoreSession *session();
-    UserId user();
+    SessionThread(UserId user, bool restoreState, bool strictIdentEnabled, QObject* parent = nullptr);
+    ~SessionThread() override;
 
 public slots:
-    void addClient(QObject *peer);
+    void addClient(Peer* peer);
+    void shutdown();
 
 private slots:
-    void setSessionInitialized();
+    void onSessionInitialized();
+    void onSessionDestroyed();
 
 signals:
     void initialized();
-    void shutdown();
-
-    void addRemoteClient(RemotePeer *peer);
-    void addInternalClient(InternalPeer *peer);
+    void shutdownSession();
+    void shutdownComplete(SessionThread*);
 
-    void passwordChangeRequested(UserId user, QString newPassword);
+    void addClientToWorker(Peer* peer);
 
 private:
-    CoreSession *_session;
-    UserId _user;
-    QList<QObject *> clientQueue;
-    bool _sessionInitialized;
-    bool _restoreState;
+    QThread _sessionThread;
+    bool _sessionInitialized{false};
 
-    bool isSessionInitialized();
-    void addClientToSession(QObject *peer);
-    void addRemoteClientToSession(RemotePeer *remotePeer);
-    void addInternalClientToSession(InternalPeer *internalPeer);
+    std::vector<Peer*> _clientQueue;
 };
-
-
-#endif