/***************************************************************************
- * 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 *
* 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"
struct QMetaObject;
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(std::initializer_list<Peer *> peerIds, std::function<void()> closure);
+ void restrictTargetPeers(QSet<Peer*> peers, std::function<void()> closure);
+ void restrictTargetPeers(Peer *peer, std::function<void()> closure) {
+ QSet<Peer*> set;
+ set.insert(peer);
+ restrictTargetPeers(set, std::move(closure));
+ }
+
+ //A better version, but only implemented on Qt5 if Initializer Lists exist
+#ifdef Q_COMPILER_INITIALIZER_LISTS
+ void restrictTargetPeers(std::initializer_list<Peer*> peers, std::function<void()> closure) {
+ restrictTargetPeers(QSet<Peer*>(peers), std::move(closure));
+ }
+#endif
+ /**}@*/
- inline int peerCount() const { return _peers.size(); }
+ inline int peerCount() const { return _peerMap.size(); }
QVariantList peerData();
Peer *peerById(int peerId);
/**
* @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);
static void disconnectDevice(QIODevice *dev, const QString &reason = QString());
- QSet<Peer *> _peers;
QHash<int, Peer*> _peerMap;
// containg a list of argtypes for fast access
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;
QHash<QByteArray, int> _methodIds;
QHash<int, int> _receiveMap; // if slot x is called then hand over the result to slot y
};
-
-#endif