X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Finternalpeer.cpp;h=2e0514a28cb1eebfe4c8f0e78f6c7656d5112227;hp=b538d2a3ba84d408dfc734b3659f7bf8f98944e3;hb=c1cf157116de7fc3da96203aa6f03c38c7ebb650;hpb=30b159cb876a9495de42e9a3e70ca050516f0805 diff --git a/src/common/internalpeer.cpp b/src/common/internalpeer.cpp index b538d2a3..2e0514a2 100644 --- a/src/common/internalpeer.cpp +++ b/src/common/internalpeer.cpp @@ -19,11 +19,12 @@ ***************************************************************************/ #include "internalpeer.h" + #include "util.h" using namespace Protocol; -InternalPeer::InternalPeer(QObject *parent) +InternalPeer::InternalPeer(QObject* parent) : Peer(nullptr, parent) { static bool registered = []() { @@ -39,7 +40,6 @@ InternalPeer::InternalPeer(QObject *parent) setFeatures(Quassel::Features{}); } - InternalPeer::~InternalPeer() { if (_isOpen) { @@ -47,63 +47,53 @@ InternalPeer::~InternalPeer() } } - QString InternalPeer::description() const { return tr("internal connection"); } - QString InternalPeer::address() const { return tr("internal connection"); } - quint16 InternalPeer::port() const { return 0; } - bool InternalPeer::isOpen() const { return _isOpen; } - bool InternalPeer::isSecure() const { return true; } - bool InternalPeer::isLocal() const { return true; } - -void InternalPeer::close(const QString &reason) +void InternalPeer::close(const QString& reason) { Q_UNUSED(reason); _isOpen = false; } - int InternalPeer::lag() const { return 0; } - -::SignalProxy *InternalPeer::signalProxy() const +::SignalProxy* InternalPeer::signalProxy() const { return _proxy; } - -void InternalPeer::setSignalProxy(::SignalProxy *proxy) +void InternalPeer::setSignalProxy(::SignalProxy* proxy) { if (!proxy && _proxy) { _proxy = nullptr; @@ -123,24 +113,30 @@ void InternalPeer::setSignalProxy(::SignalProxy *proxy) qWarning() << Q_FUNC_INFO << "Changing the SignalProxy is not supported!"; } - -void InternalPeer::setPeer(InternalPeer *peer) -{ - connect(peer, selectOverload(&InternalPeer::dispatchMessage), - this, selectOverload(&InternalPeer::handleMessage)); - connect(peer, selectOverload(&InternalPeer::dispatchMessage), - this, selectOverload(&InternalPeer::handleMessage)); - connect(peer, selectOverload(&InternalPeer::dispatchMessage), - this, selectOverload(&InternalPeer::handleMessage)); - connect(peer, selectOverload(&InternalPeer::dispatchMessage), - this, selectOverload(&InternalPeer::handleMessage)); +void InternalPeer::setPeer(InternalPeer* peer) +{ + connect(peer, + selectOverload(&InternalPeer::dispatchMessage), + this, + selectOverload(&InternalPeer::handleMessage)); + connect(peer, + selectOverload(&InternalPeer::dispatchMessage), + this, + selectOverload(&InternalPeer::handleMessage)); + connect(peer, + selectOverload(&InternalPeer::dispatchMessage), + this, + selectOverload(&InternalPeer::handleMessage)); + connect(peer, + selectOverload(&InternalPeer::dispatchMessage), + this, + selectOverload(&InternalPeer::handleMessage)); connect(peer, &Peer::disconnected, this, &InternalPeer::peerDisconnected); _isOpen = true; } - void InternalPeer::peerDisconnected() { disconnect(sender(), nullptr, this, nullptr); @@ -150,59 +146,50 @@ void InternalPeer::peerDisconnected() } } - -void InternalPeer::dispatch(const SyncMessage &msg) +void InternalPeer::dispatch(const SyncMessage& msg) { emit dispatchMessage(msg); } - -void InternalPeer::dispatch(const RpcCall &msg) +void InternalPeer::dispatch(const RpcCall& msg) { emit dispatchMessage(msg); } - -void InternalPeer::dispatch(const InitRequest &msg) +void InternalPeer::dispatch(const InitRequest& msg) { emit dispatchMessage(msg); } - -void InternalPeer::dispatch(const InitData &msg) +void InternalPeer::dispatch(const InitData& msg) { emit dispatchMessage(msg); } - -void InternalPeer::handleMessage(const Protocol::SyncMessage &msg) +void InternalPeer::handleMessage(const Protocol::SyncMessage& msg) { handle(msg); } - -void InternalPeer::handleMessage(const Protocol::RpcCall &msg) +void InternalPeer::handleMessage(const Protocol::RpcCall& msg) { handle(msg); } - -void InternalPeer::handleMessage(const Protocol::InitRequest &msg) +void InternalPeer::handleMessage(const Protocol::InitRequest& msg) { handle(msg); } - -void InternalPeer::handleMessage(const Protocol::InitData &msg) +void InternalPeer::handleMessage(const Protocol::InitData& msg) { handle(msg); } - template -void InternalPeer::handle(const T &msg) +void InternalPeer::handle(const T& msg) { - static auto setSourcePeer = [](Peer *peer) { + static auto setSourcePeer = [](Peer* peer) { auto p = SignalProxy::current(); if (p) { p->setSourcePeer(peer);