X-Git-Url: https://git.quassel-irc.org/?a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=57c2a530872020137fadd88dcf18f37c4ada0076;hb=6bf23e48f2591fc189fdefbf31f5a224169e61f4;hp=9965f0d4921aad2cc6c9b4e7e711c0764a41e4f4;hpb=8ec76e512d20ce5d1dc76de556bb98a06b75d695;p=quassel.git

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 9965f0d4..57c2a530 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -18,19 +18,23 @@
  *   59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.             *
  ***************************************************************************/
 
-#ifndef _CORESESSION_H_
-#define _CORESESSION_H_
+#ifndef CORESESSION_H
+#define CORESESSION_H
 
 #include <QString>
 #include <QVariant>
 
+#include "corecoreinfo.h"
+#include "corealiasmanager.h"
 #include "message.h"
 
 class BufferSyncer;
 class CoreBacklogManager;
+class CoreBufferViewManager;
+class CoreIrcListHelper;
 class Identity;
 class NetworkConnection;
-class Network;
+class CoreNetwork;
 struct NetworkInfo;
 class SignalProxy;
 
@@ -45,7 +49,7 @@ public:
 
   QList<BufferInfo> buffers() const;
   UserId user() const;
-  Network *network(NetworkId) const;
+  CoreNetwork *network(NetworkId) const;
   NetworkConnection *networkConnection(NetworkId) const;
   Identity *identity(IdentityId) const;
 
@@ -53,6 +57,11 @@ public:
 
   SignalProxy *signalProxy() const;
 
+  const AliasManager &aliasManager() const { return _aliasManager; }
+  AliasManager &aliasManager() { return _aliasManager; }
+
+  inline CoreIrcListHelper *ircListHelper() const { return _ircListHelper; }
+  
   void attachNetworkConnection(NetworkConnection *conn);
 
   //! Return necessary data for restoring the session after restarting the core
@@ -149,8 +158,10 @@ signals:
   void bufferRenamed(BufferId, QString);
 
 private slots:
+  void removeClient(QIODevice *dev);
+
   void recvStatusMsgFromServer(QString msg);
-  void recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
+  void recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", Message::Flags flags = Message::None);
   void networkConnected(NetworkId networkid);
   void networkDisconnected(NetworkId networkid);
 
@@ -174,13 +185,17 @@ private:
   UserId _user;
 
   SignalProxy *_signalProxy;
+  CoreAliasManager _aliasManager;
   QHash<NetworkId, NetworkConnection *> _connections;
-  QHash<NetworkId, Network *> _networks;
-  QHash<NetworkId, Network *> _networksToRemove;
+  QHash<NetworkId, CoreNetwork *> _networks;
+  //  QHash<NetworkId, CoreNetwork *> _networksToRemove;
   QHash<IdentityId, Identity *> _identities;
 
   BufferSyncer *_bufferSyncer;
   CoreBacklogManager *_backlogManager;
+  CoreBufferViewManager *_bufferViewManager;
+  CoreIrcListHelper *_ircListHelper;
+  CoreCoreInfo _coreInfo;
 
   QScriptEngine *scriptEngine;