X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=f8134ccfeddf250b5fae8f521c07b8e3913ca1a2;hp=943063b0e05e6a9186997bacb1c3c48e5de6effc;hb=da3aa4136fe01e142238f0f42fe1273481037b9d;hpb=59912f14782c193a2394a2b0d044902a59c96870

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 943063b0..f8134ccf 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -26,9 +26,11 @@
 
 #include "message.h"
 
+class BufferSyncer;
 class Identity;
-class NetworkConnection;  // FIXME get rid of
+class NetworkConnection;
 class Network;
+struct NetworkInfo;
 class SignalProxy;
 
 class QScriptEngine;
@@ -48,9 +50,6 @@ public:
 
   QVariant sessionState();
 
-  //! Retrieve a piece of session-wide data.
-  QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
-
   SignalProxy *signalProxy() const;
 
   void attachNetworkConnection(NetworkConnection *conn);
@@ -60,15 +59,12 @@ public:
   void restoreSessionState();
 
 public slots:
-  //! Store a piece session-wide data and distribute it to connected clients.
-  void storeSessionData(const QString &key, const QVariant &data);
-
   void networkStateRequested();
 
   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);
@@ -90,6 +86,35 @@ public slots:
    */
   void removeIdentity(IdentityId identity);
 
+  //! Create a network and propagate the changes to the clients.
+  /** \param info The network's settings.
+   */
+  void createNetwork(const NetworkInfo &info);
+
+  //! Update a network and propagate the changes to the clients.
+  /** \param info The updated network settings.
+   */
+  void updateNetwork(const NetworkInfo &info);
+
+  //! Remove identity and propagate that fact to the clients.
+  /** \param identity The identity to be removed.
+   */
+  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();
 
@@ -103,8 +128,6 @@ signals:
   void backlogData(BufferInfo, QVariantList, bool done);
 
   void bufferInfoUpdated(BufferInfo);
-  void sessionDataChanged(const QString &key);
-  void sessionDataChanged(const QString &key, const QVariant &data);
 
   void scriptResult(QString result);
 
@@ -120,12 +143,19 @@ signals:
    */
   void identityRemoved(IdentityId identity);
 
+  void networkCreated(NetworkId);
+  void networkRemoved(NetworkId);
+  void bufferRemoved(BufferId);
+  void bufferRenamed(BufferId, QString);
+
 private slots:
   void recvStatusMsgFromServer(QString msg);
-  void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
+  void recvMessageFromServer(Message::Type, BufferInfo::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
   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)
@@ -133,9 +163,12 @@ private slots:
    */
   void updateBufferInfo(UserId user, const BufferInfo &bufferInfo);
 
+  void storeBufferLastSeen(BufferId buffer, const QDateTime &lastSeen);
+
   void scriptRequest(QString script);
 
 private:
+  void loadSettings();
   void initScriptEngine();
 
   UserId _user;
@@ -143,9 +176,10 @@ private:
   SignalProxy *_signalProxy;
   QHash<NetworkId, NetworkConnection *> _connections;
   QHash<NetworkId, Network *> _networks;
+  QHash<NetworkId, Network *> _networksToRemove;
   QHash<IdentityId, Identity *> _identities;
 
-  QVariantMap sessionData;
+  BufferSyncer *_bufferSyncer;
 
   QScriptEngine *scriptEngine;