X-Git-Url: https://git.quassel-irc.org/?p=quassel.git;a=blobdiff_plain;f=src%2Fcommon%2Fsignalproxy.cpp;fp=src%2Fcommon%2Fsignalproxy.cpp;h=a629551c7a1f9947b31a209e96538deb2c9318e6;hp=8935538370348d5dbe1661cbfd7de05288cb2721;hb=fcacaaf16551524c7ebb6114254d005274cc3d63;hpb=714b39660fe19e7f092880019429c8da76ee2bd5 diff --git a/src/common/signalproxy.cpp b/src/common/signalproxy.cpp index 89355383..a629551c 100644 --- a/src/common/signalproxy.cpp +++ b/src/common/signalproxy.cpp @@ -288,11 +288,11 @@ bool SignalProxy::addPeer(Peer *peer) qWarning("SignalProxy: only one peer allowed in client mode!"); return false; } - connect(peer, SIGNAL(lagUpdated(int)), SIGNAL(lagUpdated(int))); + connect(peer, &Peer::lagUpdated, this, &SignalProxy::lagUpdated); } - connect(peer, SIGNAL(disconnected()), SLOT(removePeerBySender())); - connect(peer, SIGNAL(secureStateChanged(bool)), SLOT(updateSecureState())); + connect(peer, &Peer::disconnected, this, &SignalProxy::removePeerBySender); + connect(peer, &Peer::secureStateChanged, this, &SignalProxy::updateSecureState); if (!peer->parent()) peer->setParent(this); @@ -426,8 +426,8 @@ bool SignalProxy::attachSignal(QObject *sender, const char *signal, const QByteA createExtendedMetaObject(meta); _signalRelay->attachSignal(sender, methodId, sigName); - disconnect(sender, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *))); - connect(sender, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *))); + disconnect(sender, &QObject::destroyed, this, &SignalProxy::detachObject); + connect(sender, &QObject::destroyed, this, &SignalProxy::detachObject); return true; } @@ -446,8 +446,8 @@ bool SignalProxy::attachSlot(const QByteArray &sigName, QObject *recv, const cha QByteArray funcName = QMetaObject::normalizedSignature(sigName.constData()); _attachedSlots.insert(funcName, qMakePair(recv, methodId)); - disconnect(recv, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *))); - connect(recv, SIGNAL(destroyed(QObject *)), this, SLOT(detachObject(QObject *))); + disconnect(recv, &QObject::destroyed, this, &SignalProxy::detachObject); + connect(recv, &QObject::destroyed, this, &SignalProxy::detachObject); return true; }