This is it, the long-awaited huge commit with the new Network handling.

[quassel.git] / src / core / coresession.h

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 1c8924a..1249a86 100644 (file)
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -29,6 +29,7 @@
 class Identity;
 class NetworkConnection;  // FIXME get rid of
 class Network;
+struct NetworkInfo;
 class SignalProxy;
 
 class QScriptEngine;
@@ -37,7 +38,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;
@@ -56,8 +57,8 @@ public:
   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.
@@ -69,6 +70,7 @@ public slots:
 
   void connectToNetwork(QString, const QVariant &previousState = QVariant());
   void connectToNetwork(NetworkId, const QVariant &previousState = QVariant());
+  void disconnectFromNetwork(NetworkId id);
 
   //void processSignal(ClientSignal, QVariant, QVariant, QVariant);
   void sendBacklog(BufferInfo, QVariant, QVariant);
@@ -89,6 +91,21 @@ 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, bool useId = false);
+
+  //! 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);
+
 signals:
   void initialized();
 
@@ -119,11 +136,14 @@ signals:
    */
   void identityRemoved(IdentityId identity);
 
+  void networkCreated(NetworkId);
+  void networkRemoved(NetworkId);
+
 private slots:
   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 networkConnected(NetworkId networkid);
+  void networkDisconnected(NetworkId networkid);
 
   //! Called when storage updated a BufferInfo.
   /** This emits bufferInfoUpdated() via SignalProxy, iff it's one of our buffers.
@@ -135,6 +155,7 @@ private slots:
   void scriptRequest(QString script);
 
 private:
+  void loadSettings();
   void initScriptEngine();
 
   UserId _user;