X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;h=52432eb298d15953256074cb807a719c88c5d342;hp=721f32a45032359e04c6e8fd55e8608ce76cce87;hb=39328183a6a87c6eb10a9dbbffcd5d65bf154a1f;hpb=d4b81a6d777de45611034b26bd89973d19e60c96 diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index 721f32a4..52432eb2 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -70,7 +70,7 @@ private: int signalId; QByteArray signature; Signal(QObject *sender, int sigId, const QByteArray &signature) : sender(sender), signalId(sigId), signature(signature) {} - Signal() : sender(0), signalId(-1) {} + Signal() : sender(nullptr), signalId(-1) {} }; SignalProxy *_proxy; @@ -340,8 +340,8 @@ void SignalProxy::removePeer(Peer *peer) return; } - disconnect(peer, 0, this, 0); - peer->setSignalProxy(0); + disconnect(peer, nullptr, this, nullptr); + peer->setSignalProxy(nullptr); _peerMap.remove(peer->id()); emit peerRemoved(peer); @@ -398,7 +398,7 @@ SignalProxy::ExtendedMetaObject *SignalProxy::extendedMetaObject(const QMetaObje if (_extendedMetaObjects.contains(meta)) return _extendedMetaObjects[meta]; else - return 0; + return nullptr; } @@ -662,9 +662,9 @@ bool SignalProxy::invokeSlot(QObject *receiver, int methodId, const QVariantList return false; } - void *_a[] = { 0, // return type... - 0, 0, 0, 0, 0, // and 10 args - that's the max size qt can handle with signals and slots - 0, 0, 0, 0, 0 }; + void *_a[] = { nullptr, // return type... + nullptr, nullptr, nullptr, nullptr, nullptr, // and 10 args - that's the max size qt can handle with signals and slots + nullptr, nullptr, nullptr, nullptr, nullptr }; // check for argument compatibility and build params array for (int i = 0; i < numArgs; i++) {