X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=f8134ccfeddf250b5fae8f521c07b8e3913ca1a2;hp=06f7ee658e0d4588cdd89fb4276f70c083e0f1b2;hb=da3aa4136fe01e142238f0f42fe1273481037b9d;hpb=5b560ec1a01349562ac58051ca7e7fa899d4b994

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 06f7ee65..f8134ccf 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -26,6 +26,7 @@
 
 #include "message.h"
 
+class BufferSyncer;
 class Identity;
 class NetworkConnection;
 class Network;
@@ -62,8 +63,8 @@ public slots:
 
   void addClient(QObject *socket);
 
-  void connectToNetwork(QString, const QVariant &previousState = QVariant());
-  void connectToNetwork(NetworkId, const QVariant &previousState = QVariant());
+//  void connectToNetwork(QString, const QVariant &previousState = QVariant());
+  void connectToNetwork(NetworkId);
   void disconnectFromNetwork(NetworkId id);
 
   //void processSignal(ClientSignal, QVariant, QVariant, QVariant);
@@ -100,6 +101,20 @@ public slots:
    */
   void removeNetwork(NetworkId network);
 
+  //! Remove a buffer and it's backlog permanently
+  /** \param bufferId The id of the buffer to be removed.
+   *  emits bufferRemoved(bufferId) on success.
+   */
+  void removeBufferRequested(BufferId bufferId);
+
+  //! Rename a Buffer for a given network
+  /* \param networkId The id of the network the buffer belongs to
+   * \param newName   The new name of the buffer
+   * \param oldName   The old name of the buffer
+   * emits bufferRenamed(bufferId, newName) on success.
+   */
+  void renameBuffer(const NetworkId &networkId, const QString &newName, const QString &oldName);
+  
 signals:
   void initialized();
 
@@ -130,6 +145,8 @@ signals:
 
   void networkCreated(NetworkId);
   void networkRemoved(NetworkId);
+  void bufferRemoved(BufferId);
+  void bufferRenamed(BufferId, QString);
 
 private slots:
   void recvStatusMsgFromServer(QString msg);
@@ -137,6 +154,8 @@ private slots:
   void networkConnected(NetworkId networkid);
   void networkDisconnected(NetworkId networkid);
 
+  void destroyNetwork(NetworkId);
+
   //! Called when storage updated a BufferInfo.
   /** This emits bufferInfoUpdated() via SignalProxy, iff it's one of our buffers.
    *  \param user       The buffer's owner (not necessarily us)
@@ -144,6 +163,8 @@ private slots:
    */
   void updateBufferInfo(UserId user, const BufferInfo &bufferInfo);
 
+  void storeBufferLastSeen(BufferId buffer, const QDateTime &lastSeen);
+
   void scriptRequest(QString script);
 
 private:
@@ -155,8 +176,11 @@ private:
   SignalProxy *_signalProxy;
   QHash<NetworkId, NetworkConnection *> _connections;
   QHash<NetworkId, Network *> _networks;
+  QHash<NetworkId, Network *> _networksToRemove;
   QHash<IdentityId, Identity *> _identities;
 
+  BufferSyncer *_bufferSyncer;
+
   QScriptEngine *scriptEngine;
 
 };