X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=482fa76af7f5a088deeb20e43dbf75fcdb9b44e7;hp=a52e03993ba5468e49c2fe7353047bb843c68568;hb=444e91f948b435e652205c4d0f1148906e9e86dc;hpb=bd1a18355495899b5ce3003599a67e1ea7ca01cc

diff --git a/src/core/coresession.h b/src/core/coresession.h
index a52e0399..482fa76a 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -27,6 +27,8 @@
 #include "message.h"
 
 class BufferSyncer;
+class CoreBacklogManager;
+class CoreBufferViewManager;
 class Identity;
 class NetworkConnection;
 class Network;
@@ -63,12 +65,9 @@ public slots:
 
   void addClient(QObject *socket);
 
-  void connectToNetwork(QString, const QVariant &previousState = QVariant());
-  void connectToNetwork(NetworkId, const QVariant &previousState = QVariant());
+  void connectToNetwork(NetworkId);
   void disconnectFromNetwork(NetworkId id);
 
-  //void processSignal(ClientSignal, QVariant, QVariant, QVariant);
-  void sendBacklog(BufferInfo, QVariant, QVariant);
   void msgFromClient(BufferInfo, QString message);
 
   //! Create an identity and propagate the changes to the clients.
@@ -114,7 +113,11 @@ public slots:
    * emits bufferRenamed(bufferId, newName) on success.
    */
   void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName);
-  
+
+  void channelJoined(NetworkId id, const QString &channel, const QString &key = QString());
+  void channelParted(NetworkId, const QString &channel);
+  QHash<QString, QString> persistentChannels(NetworkId) const;
+
 signals:
   void initialized();
 
@@ -125,8 +128,6 @@ signals:
   //void connectToIrc(QString net);
   //void disconnectFromIrc(QString net);
 
-  void backlogData(BufferInfo, QVariantList, bool done);
-
   void bufferInfoUpdated(BufferInfo);
 
   void scriptResult(QString result);
@@ -149,6 +150,8 @@ 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 networkConnected(NetworkId networkid);
@@ -163,7 +166,7 @@ private slots:
    */
   void updateBufferInfo(UserId user, const BufferInfo &bufferInfo);
 
-  void storeBufferLastSeen(BufferId buffer, const QDateTime &lastSeen);
+  void storeBufferLastSeenMsg(BufferId buffer, const MsgId &msgId);
 
   void scriptRequest(QString script);
 
@@ -180,6 +183,8 @@ private:
   QHash<IdentityId, Identity *> _identities;
 
   BufferSyncer *_bufferSyncer;
+  CoreBacklogManager *_backlogManager;
+  CoreBufferViewManager *_bufferViewManager;
 
   QScriptEngine *scriptEngine;