/***************************************************************************
- * Copyright (C) 2005-2013 by the Quassel Project *
+ * Copyright (C) 2005-2016 by the Quassel Project *
* devel@quassel-irc.org *
* *
* This program is free software; you can redistribute it and/or modify *
#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 QIODevice;
+class Peer;
+class SyncableObject;
class SignalProxy : public QObject
{
class SignalRelay;
public:
- class AbstractPeer;
-
enum ProxyMode {
Server,
Client
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);
void updateSecureState();
signals:
- void peerRemoved(SignalProxy::AbstractPeer *peer);
+ void peerRemoved(Peer *peer);
void connected();
void disconnected();
void objectInitialized(SyncableObject *);
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);
+ template<class T>
+ void dispatch(Peer *peer, const T &protoMessage);
- 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 ¶ms, QVariant &returnValue);
- bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList());
+ template<class T>
+ void handle(Peer *, T) { Q_ASSERT(0); }
+
+ bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms, QVariant &returnValue, Peer *peer = 0);
+ bool invokeSlot(QObject *receiver, int methodId, const QVariantList ¶ms = QVariantList(), Peer *peer = 0);
void requestInit(SyncableObject *obj);
QVariantMap initData(SyncableObject *obj) const;
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;
friend class SignalRelay;
friend class SyncableObject;
- friend class InternalPeer;
- friend class RemotePeer;
+ friend class Peer;
};
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