X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=9f31f6f270551aacfeb6566e3f0000602c167f55;hp=645157ef84b6a8778f8bf1161bbd32e17b229d3a;hb=61bf66635f5b50100aabc6e8ad11d62a21e47589;hpb=0e1b154f362e13c2c9009f842e3fd6d8e7c346fc diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h index 645157ef..9f31f6f2 100644 --- a/src/common/signalproxy.h +++ b/src/common/signalproxy.h @@ -1,5 +1,5 @@ /*************************************************************************** - * Copyright (C) 2005-2012 by the Quassel Project * + * Copyright (C) 2005-2013 by the Quassel Project * * devel@quassel-irc.org * * * * This program is free software; you can redistribute it and/or modify * @@ -21,21 +21,16 @@ #ifndef SIGNALPROXY_H #define SIGNALPROXY_H -#include #include -#include -#include -#include -#include -#include #include -#include -#include -#include -class SyncableObject; +#include "protocol.h" + struct QMetaObject; +class Peer; +class SyncableObject; + class SignalProxy : public QObject { Q_OBJECT @@ -43,13 +38,6 @@ class SignalProxy : public QObject class SignalRelay; public: - class AbstractPeer; - - class SyncMessage; - class RpcCall; - class InitRequest; - class InitData; - enum ProxyMode { Server, Client @@ -71,7 +59,7 @@ public: void setMaxHeartBeatCount(int max); inline int maxHeartBeatCount() const { return _maxHeartBeatCount; } - bool addPeer(AbstractPeer *peer); + bool addPeer(Peer *peer); bool attachSignal(QObject *sender, const char *signal, const QByteArray &sigName = QByteArray()); bool attachSlot(const QByteArray &sigName, QObject *recv, const char *slot); @@ -106,7 +94,7 @@ private slots: void updateSecureState(); signals: - void peerRemoved(SignalProxy::AbstractPeer *peer); + void peerRemoved(Peer *peer); void connected(); void disconnected(); void objectInitialized(SyncableObject *); @@ -125,16 +113,19 @@ private: static const QMetaObject *metaObject(const QObject *obj); - void removePeer(AbstractPeer *peer); + void removePeer(Peer *peer); void removeAllPeers(); template void dispatch(const T &protoMessage); - void handle(AbstractPeer *peer, const SyncMessage &syncMessage); - void handle(AbstractPeer *peer, const RpcCall &rpcCall); - void handle(AbstractPeer *peer, const InitRequest &initRequest); - void handle(AbstractPeer *peer, const InitData &initData); + void handle(Peer *peer, const Protocol::SyncMessage &syncMessage); + void handle(Peer *peer, const Protocol::RpcCall &rpcCall); + void handle(Peer *peer, const Protocol::InitRequest &initRequest); + void handle(Peer *peer, const Protocol::InitData &initData); + + template + void handle(Peer *peer, T) { Q_UNUSED(peer); Q_ASSERT(0); } bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue); bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList()); @@ -145,7 +136,7 @@ private: static void disconnectDevice(QIODevice *dev, const QString &reason = QString()); - QSet _peers; + QSet _peers; // containg a list of argtypes for fast access QHash _extendedMetaObjects; @@ -170,8 +161,7 @@ private: friend class SignalRelay; friend class SyncableObject; - friend class InternalConnection; - friend class RemoteConnection; + friend class Peer; }; @@ -182,7 +172,7 @@ class SignalProxy::ExtendedMetaObject { class MethodDescriptor { -public: + public: MethodDescriptor(const QMetaMethod &method); MethodDescriptor() : _returnType(-1), _minArgCount(-1), _receiverMode(SignalProxy::Client) {} @@ -192,7 +182,7 @@ public: inline int minArgCount() const { return _minArgCount; } inline SignalProxy::ProxyMode receiverMode() const { return _receiverMode; } -private: + private: QByteArray _methodName; QList _argTypes; int _returnType; @@ -233,113 +223,4 @@ private: QHash _receiveMap; // if slot x is called then hand over the result to slot y }; - -// ================================================== -// AbstractPeer -// ================================================== -class SignalProxy::AbstractPeer : public QObject -{ - Q_OBJECT - -public: - AbstractPeer(QObject *parent = 0) : QObject(parent) {} - - virtual QString description() const = 0; - - virtual void setSignalProxy(SignalProxy *proxy) = 0; - - virtual bool isOpen() const = 0; - virtual bool isSecure() const = 0; - virtual bool isLocal() const = 0; - - virtual QString errorString() const { return QString(); } - - virtual int lag() const = 0; - -public slots: - virtual void dispatch(const SyncMessage &msg) = 0; - virtual void dispatch(const RpcCall &msg) = 0; - virtual void dispatch(const InitRequest &msg) = 0; - virtual void dispatch(const InitData &msg) = 0; - - virtual void close(const QString &reason = QString()) = 0; - -signals: - void disconnected(); - void error(QAbstractSocket::SocketError); - void secureStateChanged(bool secure = true); - void lagUpdated(int msecs); -}; - - -// ================================================== -// Protocol Messages -// ================================================== -class SignalProxy::SyncMessage -{ -public: - inline SyncMessage(const QByteArray &className, const QString &objectName, const QByteArray &slotName, const QVariantList ¶ms) - : _className(className), _objectName(objectName), _slotName(slotName), _params(params) {} - - inline QByteArray className() const { return _className; } - inline QString objectName() const { return _objectName; } - inline QByteArray slotName() const { return _slotName; } - - inline QVariantList params() const { return _params; } - -private: - QByteArray _className; - QString _objectName; - QByteArray _slotName; - QVariantList _params; -}; - - -class SignalProxy::RpcCall -{ -public: - inline RpcCall(const QByteArray &slotName, const QVariantList ¶ms) - : _slotName(slotName), _params(params) {} - - inline QByteArray slotName() const { return _slotName; } - inline QVariantList params() const { return _params; } - -private: - QByteArray _slotName; - QVariantList _params; -}; - - -class SignalProxy::InitRequest -{ -public: - inline InitRequest(const QByteArray &className, const QString &objectName) - : _className(className), _objectName(objectName) {} - - inline QByteArray className() const { return _className; } - inline QString objectName() const { return _objectName; } - -private: - QByteArray _className; - QString _objectName; -}; - - -class SignalProxy::InitData -{ -public: - inline InitData(const QByteArray &className, const QString &objectName, const QVariantMap &initData) - : _className(className), _objectName(objectName), _initData(initData) {} - - inline QByteArray className() const { return _className; } - inline QString objectName() const { return _objectName; } - - inline QVariantMap initData() const { return _initData; } - -private: - QByteArray _className; - QString _objectName; - QVariantMap _initData; -}; - #endif