projects
/
quassel.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
YES! We finally have dynamic signals between Core and Client, meaning that arbitrary
[quassel.git]
/
src
/
core
/
coresession.h
diff --git
a/src/core/coresession.h
b/src/core/coresession.h
index
54af24e
..
73204f6
100644
(file)
--- a/
src/core/coresession.h
+++ b/
src/core/coresession.h
@@
-25,16
+25,18
@@
#include <QString>
#include <QVariant>
#include <QString>
#include <QVariant>
-#include "coreproxy.h"
+//#include "coreproxy.h"
+#include "message.h"
class Server;
class Server;
+class SignalProxy;
class Storage;
class CoreSession : public QObject {
Q_OBJECT
public:
class Storage;
class CoreSession : public QObject {
Q_OBJECT
public:
- CoreSession(UserId, Storage *);
+ CoreSession(UserId, Storage *
, QObject *parent = 0
);
~CoreSession();
QList<BufferId> buffers() const;
~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);
//! 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());
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:
public slots:
- void connectTo
Irc(QStringList
);
- void processSignal(ClientSignal, QVariant, QVariant, QVariant);
+ void connectTo
Network(QString
);
+
//
void processSignal(ClientSignal, QVariant, QVariant, QVariant);
void sendBacklog(BufferId, QVariant, QVariant);
void msgFromGui(BufferId, QString message);
void sendServerStates();
signals:
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);
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 disconnectFromIrc(QString net);
void serverStateRequested();
- void backlogData(BufferId, Q
List<QVariant>
, bool done);
+ void backlogData(BufferId, Q
VariantList
, bool done);
void bufferIdUpdated(BufferId);
void sessionDataChanged(const QString &key);
void bufferIdUpdated(BufferId);
void sessionDataChanged(const QString &key);
@@
-84,11
+89,12
@@
class CoreSession : public QObject {
private:
UserId user;
private:
UserId user;
- CoreProxy *coreProxy;
+ //CoreProxy *coreProxy;
+ SignalProxy *_signalProxy;
Storage *storage;
QHash<QString, Server *> servers;
Storage *storage;
QHash<QString, Server *> servers;
-
Var
Map sessionData;
+
QVariant
Map sessionData;
QMutex mutex;
};
QMutex mutex;
};