X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcore%2Fcoresession.h;h=73204f64444204abcb8ad5b6566c82cdde36527d;hp=54af24ede946166308b10b508e67acd65e876e6d;hb=06a03c2c69ee934aaeec83512bae2fffee83a340;hpb=08da449f9620e7fcb5898e9a5a048467b6d99bff

diff --git a/src/core/coresession.h b/src/core/coresession.h
index 54af24ed..73204f64 100644
--- a/src/core/coresession.h
+++ b/src/core/coresession.h
@@ -25,16 +25,18 @@
 #include <QString>
 #include <QVariant>
 
-#include "coreproxy.h"
+//#include "coreproxy.h"
+#include "message.h"
 
 class Server;
+class SignalProxy;
 class Storage;
 
 class CoreSession : public QObject {
   Q_OBJECT
 
   public:
-    CoreSession(UserId, Storage *);
+    CoreSession(UserId, Storage *, QObject *parent = 0);
     ~CoreSession();
 
     QList<BufferId> buffers() const;
@@ -45,21 +47,24 @@ class CoreSession : public QObject {
     //! Store a piece session-wide data and distribute it to connected clients.
     void storeSessionData(const QString &key, const QVariant &data);
 
+    void addClient(QIODevice *connection);
+
   public:
     //! Retrieve a piece of session-wide data.
     QVariant retrieveSessionData(const QString &key, const QVariant &def = QVariant());
 
-    CoreProxy *proxy();
+    //CoreProxy *proxy();
+    SignalProxy *signalProxy() const;
 
   public slots:
-    void connectToIrc(QStringList);
-    void processSignal(ClientSignal, QVariant, QVariant, QVariant);
+    void connectToNetwork(QString);
+    //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 proxySignal(CoreSignal, QVariant arg1 = QVariant(), QVariant arg2 = QVariant(), QVariant arg3 = QVariant());
 
     void msgFromGui(QString net, QString buf, QString message);
     void displayMsg(Message message);
@@ -69,7 +74,7 @@ class CoreSession : public QObject {
     void disconnectFromIrc(QString net);
     void serverStateRequested();
 
-    void backlogData(BufferId, QList<QVariant>, bool done);
+    void backlogData(BufferId, QVariantList, bool done);
 
     void bufferIdUpdated(BufferId);
     void sessionDataChanged(const QString &key);
@@ -84,11 +89,12 @@ class CoreSession : public QObject {
   private:
     UserId user;
 
-    CoreProxy *coreProxy;
+    //CoreProxy *coreProxy;
+    SignalProxy *_signalProxy;
     Storage *storage;
     QHash<QString, Server *> servers;
 
-    VarMap sessionData;
+    QVariantMap sessionData;
     QMutex mutex;
 
 };