X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=51c14a7225cf4f314b6fed9b8aaf8aae3bdcdfdb;hp=1249a86cde6d2ea5c8cc289594eb1bcf1d99efe8;hb=5b083e1f67c77ceb7d1d134e976cd6081b70bf12;hpb=6623fd2d46dadd0168e4e28d1db6944c26c2a773

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 1249a86c..51c14a72 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -27,7 +27,7 @@
 #include "message.h"
 
 class Identity;
-class NetworkConnection;  // FIXME get rid of
+class NetworkConnection;
 class Network;
 struct NetworkInfo;
 class SignalProxy;
@@ -49,9 +49,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);
@@ -61,9 +58,6 @@ 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);
@@ -94,7 +88,7 @@ public slots:
   //! Create a network and propagate the changes to the clients.
   /** \param info The network's settings.
    */
-  void createNetwork(const NetworkInfo &info, bool useId = false);
+  void createNetwork(const NetworkInfo &info);
 
   //! Update a network and propagate the changes to the clients.
   /** \param info The updated network settings.
@@ -119,8 +113,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);
 
@@ -141,10 +133,12 @@ signals:
 
 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)
@@ -163,10 +157,9 @@ private:
   SignalProxy *_signalProxy;
   QHash<NetworkId, NetworkConnection *> _connections;
   QHash<NetworkId, Network *> _networks;
+  QHash<NetworkId, Network *> _networksToRemove;
   QHash<IdentityId, Identity *> _identities;
 
-  QVariantMap sessionData;
-
   QScriptEngine *scriptEngine;
 
 };