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

diff --git a/src/common/signalproxy.h b/src/common/signalproxy.h
index 500693f4..ac4b8c6a 100644
--- a/src/common/signalproxy.h
+++ b/src/common/signalproxy.h
@@ -18,13 +18,13 @@
  *   51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA.         *
  ***************************************************************************/
 
-#ifndef SIGNALPROXY_H
-#define SIGNALPROXY_H
+#pragma once
 
 #include <QEvent>
 #include <QSet>
 
 #include <functional>
+#include <initializer_list>
 
 #include "protocol.h"
 
@@ -80,10 +80,14 @@ public:
     void dumpProxyStats();
     void dumpSyncMap(SyncableObject *object);
 
+    static SignalProxy *current() {
+        return _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);
@@ -103,7 +107,7 @@ public:
 #endif
     /**}@*/
 
-    inline int peerCount() const { return _peers.size(); }
+    inline int peerCount() const { return _peerMap.size(); }
     QVariantList peerData();
 
     Peer *peerById(int peerId);
@@ -111,7 +115,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);
@@ -177,7 +188,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
@@ -206,7 +216,10 @@ private:
     QSet<Peer *> _restrictedTargets;
     bool _restrictMessageTarget = false;
 
-    Peer *_sourcePeer;
+    Peer *_sourcePeer = nullptr;
+    Peer *_targetPeer = nullptr;
+
+    thread_local static SignalProxy *_current;
 
     friend class SignalRelay;
     friend class SyncableObject;
@@ -271,5 +284,3 @@ private:
     QHash<QByteArray, int> _methodIds;
     QHash<int, int> _receiveMap; // if slot x is called then hand over the result to slot y
 };
-
-#endif