X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.h;h=a94861713387f5dc2435b7f8c49ef7c59df473b5;hp=500693f4478239c301c9d5b4e95709861eba5744;hb=158443f71d48215eea8b47b836b61afd77654b78;hpb=4fd26969c9cca2e4d81553320283ab4374897b97

diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index 500693f4..a9486171 100644
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -1,5 +1,5 @@
 /***************************************************************************
- *   Copyright (C) 2005-2016 by the Quassel Project                        *
+ *   Copyright (C) 2005-2018 by the Quassel Project                        *
  *   devel@quassel-irc.org                                                 *
  *                                                                         *
  *   This program is free software; you can redistribute it and/or modify  *
@@ -18,13 +18,15 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef SIGNALPROXY_H
-#define SIGNALPROXY_H
+#pragma once
+
+#include "common-export.h"
 
 #include <QEvent>
 #include <QSet>
 
 #include <functional>
+#include <initializer_list>
 
 #include "protocol.h"
 
@@ -34,7 +36,7 @@ class QIODevice;
 class Peer;
 class SyncableObject;
 
-class SignalProxy : public QObject
+class COMMON_EXPORT SignalProxy : public QObject
 {
     Q_OBJECT
 
@@ -52,7 +54,7 @@ public:
 
     SignalProxy(QObject *parent);
     SignalProxy(ProxyMode mode, QObject *parent);
-    virtual ~SignalProxy();
+    ~SignalProxy() override;
 
     void setProxyMode(ProxyMode mode);
     inline ProxyMode proxyMode() const { return _proxyMode; }
@@ -80,10 +82,12 @@ public:
     void dumpProxyStats();
     void dumpSyncMap(SyncableObject *object);
 
+    static SignalProxy *current();
+
     /**@{*/
     /**
      * This method allows to send a signal only to a limited set of peers
-     * @param peerIds A list of peers that should receive it
+     * @param peers A list of peers that should receive it
      * @param closure Code you want to execute within of that restricted environment
      */
     void restrictTargetPeers(QSet<Peer*> peers, std::function<void()> closure);
@@ -94,16 +98,14 @@ public:
     }
 
     //A better version, but only implemented on Qt5 if Initializer Lists exist
-#if QT_VERSION >= QT_VERSION_CHECK(5, 0, 0)
 #ifdef Q_COMPILER_INITIALIZER_LISTS
     void restrictTargetPeers(std::initializer_list<Peer*> peers, std::function<void()> closure) {
         restrictTargetPeers(QSet<Peer*>(peers), std::move(closure));
     }
-#endif
 #endif
     /**}@*/
 
-    inline int peerCount() const { return _peers.size(); }
+    inline int peerCount() const { return _peerMap.size(); }
     QVariantList peerData();
 
     Peer *peerById(int peerId);
@@ -111,7 +113,14 @@ public:
     /**
      * @return If handling a signal, the Peer from which the current signal originates
      */
-    Peer *sourcePeer() { return _sourcePeer; }
+    Peer *sourcePeer();
+    void setSourcePeer(Peer *sourcePeer);
+
+    /**
+     * @return If sending a signal, the Peer to which the current signal is directed
+     */
+    Peer *targetPeer();
+    void setTargetPeer(Peer *targetPeer);
 
 public slots:
     void detachObject(QObject *obj);
@@ -119,7 +128,7 @@ public slots:
     void detachSlots(QObject *receiver);
 
 protected:
-    void customEvent(QEvent *event);
+    void customEvent(QEvent *event) override;
     void sync_call__(const SyncableObject *obj, ProxyMode modeType, const char *funcname, va_list ap);
     void renameObject(const SyncableObject *obj, const QString &newname, const QString &oldname);
 
@@ -168,8 +177,8 @@ private:
     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);
+    bool invokeSlot(QObject *receiver, int methodId, const QVariantList &params, QVariant &returnValue, Peer *peer = nullptr);
+    bool invokeSlot(QObject *receiver, int methodId, const QVariantList &params = QVariantList(), Peer *peer = nullptr);
 
     void requestInit(SyncableObject *obj);
     QVariantMap initData(SyncableObject *obj) const;
@@ -177,7 +186,6 @@ private:
 
     static void disconnectDevice(QIODevice *dev, const QString &reason = QString());
 
-    QSet<Peer *> _peers;
     QHash<int, Peer*> _peerMap;
 
     // containg a list of argtypes for fast access
@@ -187,12 +195,12 @@ private:
     SignalRelay *_signalRelay;
 
     // RPC function -> (object, slot ID)
-    typedef QPair<QObject *, int> MethodId;
-    typedef QMultiHash<QByteArray, MethodId> SlotHash;
+    using MethodId = QPair<QObject *, int>;
+    using SlotHash = QMultiHash<QByteArray, MethodId>;
     SlotHash _attachedSlots;
 
     // slaves for sync
-    typedef QHash<QString, SyncableObject *> ObjectId;
+    using ObjectId = QHash<QString, SyncableObject *>;
     QHash<QByteArray, ObjectId> _syncSlave;
 
     ProxyMode _proxyMode;
@@ -206,7 +214,8 @@ private:
     QSet<Peer *> _restrictedTargets;
     bool _restrictMessageTarget = false;
 
-    Peer *_sourcePeer;
+    Peer *_sourcePeer = nullptr;
+    Peer *_targetPeer = nullptr;
 
     friend class SignalRelay;
     friend class SyncableObject;
@@ -223,7 +232,7 @@ class SignalProxy::ExtendedMetaObject
     {
     public:
         MethodDescriptor(const QMetaMethod &method);
-        MethodDescriptor() : _returnType(-1), _minArgCount(-1), _receiverMode(SignalProxy::Client) {}
+        MethodDescriptor()  {}
 
         inline const QByteArray &methodName() const { return _methodName; }
         inline const QList<int> &argTypes() const { return _argTypes; }
@@ -234,9 +243,9 @@ class SignalProxy::ExtendedMetaObject
     private:
         QByteArray _methodName;
         QList<int> _argTypes;
-        int _returnType;
-        int _minArgCount;
-        SignalProxy::ProxyMode _receiverMode; // Only acceptable as a Sync Call if the receiving SignalProxy is in this mode.
+        int _returnType{-1};
+        int _minArgCount{-1};
+        SignalProxy::ProxyMode _receiverMode{SignalProxy::Client}; // Only acceptable as a Sync Call if the receiving SignalProxy is in this mode.
     };
 
 
@@ -271,5 +280,3 @@ private:
     QHash<QByteArray, int> _methodIds;
     QHash<int, int> _receiveMap; // if slot x is called then hand over the result to slot y
 };
-
-#endif