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

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 1c8924ab..482fa76a 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -26,9 +26,13 @@
 
 #include "message.h"
 
+class BufferSyncer;
+class CoreBacklogManager;
+class CoreBufferViewManager;
 class Identity;
-class NetworkConnection;  // FIXME get rid of
+class NetworkConnection;
 class Network;
+struct NetworkInfo;
 class SignalProxy;
 
 class QScriptEngine;
@@ -37,7 +41,7 @@ class CoreSession : public QObject {
   Q_OBJECT
 
 public:
-  CoreSession(UserId, QObject *parent = 0);
+  CoreSession(UserId, bool restoreState, QObject *parent = 0);
   ~CoreSession();
 
   QList<BufferInfo> buffers() const;
@@ -48,30 +52,22 @@ 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);
 
   //! Return necessary data for restoring the session after restarting the core
-  QVariant state() const;
-  void restoreState(const QVariant &previousState);
+  void saveSessionState() const;
+  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(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.
@@ -89,6 +85,39 @@ 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);
+
+  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();
 
@@ -99,11 +128,7 @@ signals:
   //void connectToIrc(QString net);
   //void disconnectFromIrc(QString net);
 
-  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);
 
@@ -119,11 +144,20 @@ signals:
    */
   void identityRemoved(IdentityId identity);
 
+  void networkCreated(NetworkId);
+  void networkRemoved(NetworkId);
+  void bufferRemoved(BufferId);
+  void bufferRenamed(BufferId, QString);
+
 private slots:
+  void removeClient(QIODevice *dev);
+
   void recvStatusMsgFromServer(QString msg);
-  void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
-  void networkConnected(uint networkid);
-  void networkDisconnected(uint networkid);
+  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.
@@ -132,9 +166,12 @@ private slots:
    */
   void updateBufferInfo(UserId user, const BufferInfo &bufferInfo);
 
+  void storeBufferLastSeenMsg(BufferId buffer, const MsgId &msgId);
+
   void scriptRequest(QString script);
 
 private:
+  void loadSettings();
   void initScriptEngine();
 
   UserId _user;
@@ -142,9 +179,12 @@ private:
   SignalProxy *_signalProxy;
   QHash<NetworkId, NetworkConnection *> _connections;
   QHash<NetworkId, Network *> _networks;
+  QHash<NetworkId, Network *> _networksToRemove;
   QHash<IdentityId, Identity *> _identities;
 
-  QVariantMap sessionData;
+  BufferSyncer *_bufferSyncer;
+  CoreBacklogManager *_backlogManager;
+  CoreBufferViewManager *_bufferViewManager;
 
   QScriptEngine *scriptEngine;