Ok this is the major rework of quassel we've all been waiting for. For the actual...

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

diff --git a/src/core/coresession.h b/src/core/coresession.h
index e963131..009a2ef 100644 (file)
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -25,71 +25,74 @@
 #include <QString>
 #include <QVariant>
 
-#include "coreproxy.h"
+#include "message.h"
 
 class Server;
+class SignalProxy;
 class Storage;
 
 class CoreSession : public QObject {
   Q_OBJECT
 
-  public:
-    CoreSession(UserId, Storage *);
-    ~CoreSession();
-
-    QList<BufferId> buffers() const;
-    UserId userId() const;
-    QVariant sessionState();
-
-  public slots:
-    //! Store a piece session-wide data and distribute it to connected clients.
-    void storeSessionData(const QString &key, const QVariant &data);
-
-  public:
-    //! Retrieve a piece of session-wide data.
-    QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
-
-    CoreProxy *proxy();
-
-  public slots:
-    void connectToIrc(QStringList);
-    void processSignal(ClientSignal, QVariant, QVariant, QVariant);
-    void sendBacklog(BufferId, QVariant, QVariant);
-    void msgFromGui(BufferId, QString message);
-    void sendServerStates();
-
-  signals:
-    void proxySignal(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
-
-    void msgFromGui(QString net, QString buf, QString message);
-    void displayMsg(Message message);
-    void displayStatusMsg(QString, QString);
-
-    void connectToIrc(QString net);
-    void disconnectFromIrc(QString net);
-    void serverStateRequested();
-
-    void backlogData(BufferId, QList<QVariant>, bool done);
-
-    void bufferIdUpdated(BufferId);
-    void sessionDataChanged(const QString &key);
-    void sessionDataChanged(const QString &key, const QVariant &data);
-
-  private slots:
-    void recvStatusMsgFromServer(QString msg);
-    void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
-    void serverConnected(QString net);
-    void serverDisconnected(QString net);
-
-  private:
-    CoreProxy *coreProxy;
-    Storage *storage;
-    QHash<QString, Server *> servers;
-    UserId user;
-
-    VarMap sessionData;
-    QMutex mutex;
-
+public:
+  CoreSession(UserId, Storage *, QObject *parent = 0);
+  virtual ~CoreSession();
+
+  uint getNetworkId(const QString &network) const;
+  QList<BufferInfo> buffers() const;
+  UserId userId() const;
+  QVariant sessionState();
+
+  //! Retrieve a piece of session-wide data.
+  QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
+  
+  SignalProxy *signalProxy() const;
+                                 
+  void attachServer(Server *server);
+                                  
+public slots:
+  //! Store a piece session-wide data and distribute it to connected clients.
+  void storeSessionData(const QString &key, const QVariant &data);
+
+  void serverStateRequested();
+
+  void addClient(QIODevice *connection);
+  
+  void connectToNetwork(QString);
+  
+  //void processSignal(ClientSignal, QVariant, QVariant, QVariant);
+  void sendBacklog(BufferInfo, QVariant, QVariant);
+  void msgFromGui(BufferInfo, QString message);
+  
+signals:
+  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 backlogData(BufferInfo, QVariantList, bool done);
+
+  void bufferInfoUpdated(BufferInfo);
+  void sessionDataChanged(const QString &key);
+  void sessionDataChanged(const QString &key, const QVariant &data);
+
+private slots:
+  void recvStatusMsgFromServer(QString msg);
+  void recvMessageFromServer(Message::Type, QString target, QString text, QString sender = "", quint8 flags = Message::None);
+  void serverConnected(uint networkid);
+  void serverDisconnected(uint networkid);
+
+private:
+  UserId user;
+  
+  SignalProxy *_signalProxy;
+  Storage *storage;
+  QHash<uint, Server *> servers;
+  
+  QVariantMap sessionData;
+  QMutex mutex;
 };
 
 #endif