Simplify session thread handling in Core

[quassel.git] / src / core / core.h

diff --git a/src/core/core.h b/src/core/core.h
index de1ad6e..a17211d 100644 (file)
--- a/src/core/core.h
+++ b/src/core/core.h
@@ -1,5 +1,5 @@
 /***************************************************************************
 /***************************************************************************

- *   Copyright (C) 2005-2013 by the Quassel Project                        *
+ *   Copyright (C) 2005-2015 by the Quassel Project                        *

  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *


@@ -530,7 +530,7 @@ private:
     void init();
     static Core *instanceptr;
 
     void init();
     static Core *instanceptr;
 

-    SessionThread *createSession(UserId userId, bool restoreState = false);
+    SessionThread *sessionForUser(UserId userId, bool restoreState = false);

     void addClientHelper(RemotePeer *peer, UserId uid);
     //void processCoreSetup(QTcpSocket *socket, QVariantMap &msg);
     QString setupCoreForInternalUsage();
     void addClientHelper(RemotePeer *peer, UserId uid);
     //void processCoreSetup(QTcpSocket *socket, QVariantMap &msg);
     QString setupCoreForInternalUsage();


@@ -547,7 +547,7 @@ private:
 
 private:
     QSet<CoreAuthHandler *> _connectingClients;
 
 private:
     QSet<CoreAuthHandler *> _connectingClients;

-    QHash<UserId, SessionThread *> sessions;
+    QHash<UserId, SessionThread *> _sessions;

     Storage *_storage;
     QTimer _storageSyncTimer;
 
     Storage *_storage;
     QTimer _storageSyncTimer;