X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fsessionthread.cpp;h=d8e8c4dbca720a467276f27b4883e51763150c9e;hp=bdc0a7388d1fcd46dd99db105d2b76db7e54ec5d;hb=1f21c1f9613031ae263eeed0c4883bfcd5488343;hpb=fcacaaf16551524c7ebb6114254d005274cc3d63

diff --git a/src/core/sessionthread.cpp b/src/core/sessionthread.cpp
index bdc0a738..d8e8c4db 100644
--- a/src/core/sessionthread.cpp
+++ b/src/core/sessionthread.cpp
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2018 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,6 +18,8 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
+#include "sessionthread.h"
+
 #include <QPointer>
 #include <QTimer>
 
@@ -25,7 +27,6 @@
 #include "coresession.h"
 #include "internalpeer.h"
 #include "remotepeer.h"
-#include "sessionthread.h"
 #include "signalproxy.h"
 
 namespace {
@@ -39,15 +40,14 @@ public:
         : _userId{userId}
         , _restoreState{restoreState}
         , _strictIdentEnabled{strictIdentEnabled}
-    {
-    }
+    {}
 
 public slots:
     void initialize()
     {
         _session = new CoreSession{_userId, _restoreState, _strictIdentEnabled, this};
         connect(_session, &QObject::destroyed, QThread::currentThread(), &QThread::quit);
-        connect(_session, SIGNAL(sessionState(Protocol::SessionState)), Core::instance(), SIGNAL(sessionState(Protocol::SessionState)));
+        connect(_session, &CoreSession::sessionStateReceived, Core::instance(), &Core::sessionStateReceived);
         emit initialized();
     }
 
@@ -58,7 +58,7 @@ public slots:
         }
     }
 
-    void addClient(Peer *peer)
+    void addClient(Peer* peer)
     {
         if (!_session) {
             qWarning() << "Session not initialized!";
@@ -89,9 +89,9 @@ private:
     QPointer<CoreSession> _session;
 };
 
-}  // anon
+}  // namespace
 
-SessionThread::SessionThread(UserId uid, bool restoreState, bool strictIdentEnabled, QObject *parent)
+SessionThread::SessionThread(UserId uid, bool restoreState, bool strictIdentEnabled, QObject* parent)
     : QObject(parent)
 {
     auto worker = new Worker(uid, restoreState, strictIdentEnabled);
@@ -108,7 +108,6 @@ SessionThread::SessionThread(UserId uid, bool restoreState, bool strictIdentEnab
     QTimer::singleShot(0, &_sessionThread, SLOT(start()));
 }
 
-
 SessionThread::~SessionThread()
 {
     // shut down thread gracefully
@@ -116,17 +115,15 @@ SessionThread::~SessionThread()
     _sessionThread.wait(30000);
 }
 
-
 void SessionThread::shutdown()
 {
     emit shutdownSession();
 }
 
-
 void SessionThread::onSessionInitialized()
 {
     _sessionInitialized = true;
-    for (auto &&peer : _clientQueue) {
+    for (auto&& peer : _clientQueue) {
         peer->setParent(nullptr);
         peer->moveToThread(&_sessionThread);
         emit addClientToWorker(peer);
@@ -134,13 +131,12 @@ void SessionThread::onSessionInitialized()
     _clientQueue.clear();
 }
 
-
 void SessionThread::onSessionDestroyed()
 {
     emit shutdownComplete(this);
 }
 
-void SessionThread::addClient(Peer *peer)
+void SessionThread::addClient(Peer* peer)
 {
     if (_sessionInitialized) {
         peer->setParent(nullptr);