X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=01ffd8e8fdb469a0f9886971fa9e368514cef30b;hp=27417e5ea8f799220c9beb9048c03415ec1811e4;hb=e2ae384f869498c51d2b42cc366359547c25f890;hpb=fd7c2c4a41b5bb9cffcfe7a8f86a28ab7f38ac27

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 27417e5e..01ffd8e8 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -21,16 +21,15 @@
 #ifndef _CORESESSION_H_
 #define _CORESESSION_H_
 
-#include <QObject>
 #include <QString>
 #include <QVariant>
 
 #include "message.h"
 
 class Identity;
-class NetworkConnection;
+class NetworkConnection;  // FIXME get rid of
+class Network;
 class SignalProxy;
-class Storage;
 
 class QScriptEngine;
 
@@ -38,12 +37,15 @@ class CoreSession : public QObject {
   Q_OBJECT
 
 public:
-  CoreSession(UserId, Storage *, QObject *parent = 0);
-  virtual ~CoreSession();
+  CoreSession(UserId, bool restoreState, QObject *parent = 0);
+  ~CoreSession();
 
-  NetworkId getNetworkId(const QString &network) const;
   QList<BufferInfo> buffers() const;
-  UserId userId() const;
+  UserId user() const;
+  Network *network(NetworkId) const;
+  NetworkConnection *networkConnection(NetworkId) const;
+  Identity *identity(IdentityId) const;
+
   QVariant sessionState();
 
   //! Retrieve a piece of session-wide data.
@@ -54,8 +56,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.
@@ -63,14 +65,14 @@ public slots:
 
   void networkStateRequested();
 
-  void addClient(QIODevice *connection);
+  void addClient(QObject *socket);
 
   void connectToNetwork(QString, const QVariant &previousState = QVariant());
-  //void connectToNetwork(NetworkId);
+  void connectToNetwork(NetworkId, const QVariant &previousState = QVariant());
 
   //void processSignal(ClientSignal, QVariant, QVariant, QVariant);
   void sendBacklog(BufferInfo, QVariant, QVariant);
-  void msgFromGui(BufferInfo, QString message);
+  void msgFromClient(BufferInfo, QString message);
 
   //! Create an identity and propagate the changes to the clients.
   /** \param identity The identity to be created.
@@ -88,12 +90,14 @@ public slots:
   void removeIdentity(IdentityId identity);
 
 signals:
-  void msgFromGui(uint netid, QString buf, QString message);
+  void initialized();
+
+  //void msgFromGui(uint netid, QString buf, QString message);
   void displayMsg(Message message);
   void displayStatusMsg(QString, QString);
 
-  void connectToIrc(QString net);
-  void disconnectFromIrc(QString net);
+  //void connectToIrc(QString net);
+  //void disconnectFromIrc(QString net);
 
   void backlogData(BufferInfo, QVariantList, bool done);
 
@@ -118,26 +122,32 @@ signals:
 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.
+   *  \param user       The buffer's owner (not necessarily us)
+   *  \param bufferInfo The updated BufferInfo
+   */
+  void updateBufferInfo(UserId user, const BufferInfo &bufferInfo);
 
   void scriptRequest(QString script);
-  
+
 private:
   void initScriptEngine();
-  
-  UserId user;
-  
+
+  UserId _user;
+
   SignalProxy *_signalProxy;
-  Storage *storage;
-  QHash<NetworkId, NetworkConnection *> connections;
-  
+  QHash<NetworkId, NetworkConnection *> _connections;
+  QHash<NetworkId, Network *> _networks;
+  QHash<IdentityId, Identity *> _identities;
+
   QVariantMap sessionData;
-  QMutex mutex;
 
   QScriptEngine *scriptEngine;
 
-  QHash<IdentityId, Identity *> _identities;
 };
 
 #endif