#include <QAbstractSocket>
#include <QTcpSocket>
#include <QList>
+#include <QPointer>
#include "buffer.h"
#include "message.h"
-#include "proxy_common.h"
+
class AbstractUi;
-class ClientProxy;
class BufferTreeModel;
class QtGui;
+class SignalProxy;
class QTimer;
static BufferId bufferId(QString net, QString buf);
static BufferTreeModel *bufferModel();
+ static SignalProxy *signalProxy();
static AbstractUiMsg *layoutMsg(const Message &);
public slots:
//void selectBuffer(Buffer *);
//void connectToLocalCore();
- void connectToCore(const VarMap &);
+ void connectToCore(const QVariantMap &);
void disconnectFromCore();
private slots:
void recvCoreState(const QVariant &state);
void recvSessionData(const QString &key, const QVariant &data);
- void recvProxySignal(ClientSignal sig, QVariant arg1, QVariant arg2, QVariant arg3);
- void serverError(QAbstractSocket::SocketError);
- void serverHasData();
+ void coreSocketError(QAbstractSocket::SocketError);
+ void coreHasData();
void coreSocketConnected();
void coreSocketDisconnected();
+ void coreSocketStateChanged(QAbstractSocket::SocketState);
void userInput(BufferId, QString);
void networkConnected(QString);
void recvMessage(const Message &message);
void recvStatusMsg(QString network, QString message);
void setTopic(QString net, QString buf, QString);
- void addNick(QString net, QString nick, VarMap props);
+ void addNick(QString net, QString nick, QVariantMap props);
void removeNick(QString net, QString nick);
void renameNick(QString net, QString oldnick, QString newnick);
- void updateNick(QString net, QString nick, VarMap props);
+ void updateNick(QString net, QString nick, QVariantMap props);
void setOwnNick(QString net, QString nick);
- void recvBacklogData(BufferId, const QList<QVariant> &, bool);
+ void recvBacklogData(BufferId, QVariantList, bool);
void updateBufferId(BufferId);
void removeBuffer(Buffer *);
void disconnectFromLocalCore(); // defined in main.cpp
AbstractUi *mainUi;
- ClientProxy *clientProxy;
+ SignalProxy *_signalProxy;
BufferTreeModel *_bufferModel;
- QTcpSocket socket;
+ QPointer<QIODevice> socket;
quint32 blockSize;
static bool connectedToCore;
- static VarMap coreConnectionInfo;
+ static QVariantMap coreConnectionInfo;
static QHash<BufferId, Buffer *> buffers;
static QHash<uint, BufferId> bufferIds;
- static QHash<QString, QHash<QString, VarMap> > nicks;
+ static QHash<QString, QHash<QString, QVariantMap> > nicks;
static QHash<QString, bool> netConnected;
static QStringList netsAwaitingInit;
static QHash<QString, QString> ownNick;
QTimer *layoutTimer;
QList<Buffer *> layoutQueue;
- VarMap sessionData;
+ QVariantMap sessionData;
};
#endif