X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=410d48ccd95a1545b86392e615cce42240217088;hp=d446fefc86460aa15c87af130ab7b18d41a4bbf6;hb=f44459818f34b556df8ff2f400098c50b78501eb;hpb=76db8cdfbeffaaba359c8e80cf2146da9e9e7f8a

diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index d446fefc..410d48cc 100644
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -21,23 +21,15 @@
 #ifndef SIGNALPROXY_H
 #define SIGNALPROXY_H
 
-#include <QAbstractSocket>
 #include <QEvent>
-#include <QList>
-#include <QHash>
-#include <QVariant>
-#include <QVariantMap>
-#include <QPair>
 #include <QSet>
-#include <QString>
-#include <QByteArray>
-#include <QTimer>
 
 #include "protocol.h"
 
-class SyncableObject;
 struct QMetaObject;
 
+class Peer;
+class SyncableObject;
 
 class SignalProxy : public QObject
 {
@@ -46,8 +38,6 @@ class SignalProxy : public QObject
     class SignalRelay;
 
 public:
-    class AbstractPeer;
-
     enum ProxyMode {
         Server,
         Client
@@ -69,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);
@@ -104,7 +94,7 @@ private slots:
     void updateSecureState();
 
 signals:
-    void peerRemoved(SignalProxy::AbstractPeer *peer);
+    void peerRemoved(Peer *peer);
     void connected();
     void disconnected();
     void objectInitialized(SyncableObject *);
@@ -123,19 +113,23 @@ private:
 
     static const QMetaObject *metaObject(const QObject *obj);
 
-    void removePeer(AbstractPeer *peer);
+    void removePeer(Peer *peer);
     void removeAllPeers();
 
     template<class T>
     void dispatch(const T &protoMessage);
+    void dispatch(Peer *peer, const Protocol::RpcCall &rpcCall);
 
-    void handle(AbstractPeer *peer, const Protocol::SyncMessage &syncMessage);
-    void handle(AbstractPeer *peer, const Protocol::RpcCall &rpcCall);
-    void handle(AbstractPeer *peer, const Protocol::InitRequest &initRequest);
-    void handle(AbstractPeer *peer, const Protocol::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);
 
-    bool invokeSlot(QObject *receiver, int methodId, const QVariantList &params, QVariant &returnValue);
-    bool invokeSlot(QObject *receiver, int methodId, const QVariantList &params = QVariantList());
+    template<class T>
+    void handle(Peer *, T) { Q_ASSERT(0); }
+
+    bool invokeSlot(QObject *receiver, int methodId, const QVariantList &params, QVariant &returnValue, Peer *peer = 0);
+    bool invokeSlot(QObject *receiver, int methodId, const QVariantList &params = QVariantList(), Peer *peer = 0);
 
     void requestInit(SyncableObject *obj);
     QVariantMap initData(SyncableObject *obj) const;
@@ -143,7 +137,7 @@ private:
 
     static void disconnectDevice(QIODevice *dev, const QString &reason = QString());
 
-    QSet<AbstractPeer *> _peers;
+    QSet<Peer *> _peers;
 
     // containg a list of argtypes for fast access
     QHash<const QMetaObject *, ExtendedMetaObject *> _extendedMetaObjects;
@@ -168,8 +162,7 @@ private:
 
     friend class SignalRelay;
     friend class SyncableObject;
-    friend class InternalPeer;
-    friend class RemotePeer;
+    friend class Peer;
 };
 
 
@@ -231,42 +224,4 @@ private:
     QHash<int, int> _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 Protocol::SyncMessage &msg) = 0;
-    virtual void dispatch(const Protocol::RpcCall &msg) = 0;
-    virtual void dispatch(const Protocol::InitRequest &msg) = 0;
-    virtual void dispatch(const Protocol::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);
-};
-
 #endif