Port majority of old-style connects (#237)

This provides more type safety and is future-proof.

10 files changed, 127 insertions, 268 deletions

diff --git a/src/client/QXmppBookmarkManager.cpp b/src/client/QXmppBookmarkManager.cpp
index cd93782f..0cf993c3 100644
--- a/src/client/QXmppBookmarkManager.cpp
+++ b/src/client/QXmppBookmarkManager.cpp
@@ -145,18 +145,14 @@ bool QXmppBookmarkManager::setBookmarks(const QXmppBookmarkSet &bookmarks)
 /// \cond
 void QXmppBookmarkManager::setClient(QXmppClient *client)
 {
-    bool check;
-    Q_UNUSED(check);
 
     QXmppClientExtension::setClient(client);
 
-    check = connect(client, SIGNAL(connected()),
-                    this, SLOT(slotConnected()));
-    Q_ASSERT(check);
+    connect(client, &QXmppClient::connected,
+                    this, &QXmppBookmarkManager::slotConnected);
 
-    check = connect(client, SIGNAL(disconnected()),
-                    this, SLOT(slotDisconnected()));
-    Q_ASSERT(check);
+    connect(client, &QXmppClient::disconnected,
+                    this, &QXmppBookmarkManager::slotDisconnected);
 }
 
 bool QXmppBookmarkManager::handleStanza(const QDomElement &stanza)
diff --git a/src/client/QXmppCallManager.cpp b/src/client/QXmppCallManager.cpp
index 640dbf0e..f670aa02 100644
--- a/src/client/QXmppCallManager.cpp
+++ b/src/client/QXmppCallManager.cpp
@@ -204,7 +204,7 @@ void QXmppCallPrivate::handleRequest(const QXmppJingleIq &iq)
     } else if (iq.action() == QXmppJingleIq::SessionInfo) {
 
         // notify user
-        QTimer::singleShot(0, q, SIGNAL(ringing()));
+        QTimer::singleShot(0, q, &QXmppCall::ringing);
 
     } else if (iq.action() == QXmppJingleIq::SessionTerminate) {
 
@@ -291,7 +291,7 @@ void QXmppCallPrivate::handleRequest(const QXmppJingleIq &iq)
 QXmppCallPrivate::Stream *QXmppCallPrivate::createStream(const QString &media)
 {
     bool check;
-    Q_UNUSED(check);
+    Q_UNUSED(check)
     Q_ASSERT(manager);
 
     auto *stream = new Stream;
@@ -325,32 +325,26 @@ QXmppCallPrivate::Stream *QXmppCallPrivate::createStream(const QString &media)
     stream->connection->bind(QXmppIceComponent::discoverAddresses());
 
     // connect signals
-    check = QObject::connect(stream->connection, SIGNAL(localCandidatesChanged()),
-        q, SLOT(localCandidatesChanged()));
-    Q_ASSERT(check);
+    QObject::connect(stream->connection, &QXmppIceConnection::localCandidatesChanged,
+        q, &QXmppCall::localCandidatesChanged);
 
-    check = QObject::connect(stream->connection, SIGNAL(connected()),
-        q, SLOT(updateOpenMode()));
-    Q_ASSERT(check);
+    QObject::connect(stream->connection, &QXmppIceConnection::connected,
+        q, &QXmppCall::updateOpenMode);
 
-    check = QObject::connect(q, SIGNAL(stateChanged(QXmppCall::State)),
-        q, SLOT(updateOpenMode()));
-    Q_ASSERT(check);
+    QObject::connect(q, &QXmppCall::stateChanged,
+        q, &QXmppCall::updateOpenMode);
 
-    check = QObject::connect(stream->connection, SIGNAL(disconnected()),
-        q, SLOT(hangup()));
-    Q_ASSERT(check);
+    QObject::connect(stream->connection, &QXmppIceConnection::disconnected,
+        q, &QXmppCall::hangup);
 
     if (channelObject) {
         QXmppIceComponent *rtpComponent = stream->connection->component(RTP_COMPONENT);
 
-        check = QObject::connect(rtpComponent, SIGNAL(datagramReceived(QByteArray)),
+        QObject::connect(rtpComponent, SIGNAL(datagramReceived(QByteArray)),
                         channelObject, SLOT(datagramReceived(QByteArray)));
-        Q_ASSERT(check);
 
-        check = QObject::connect(channelObject, SIGNAL(sendDatagram(QByteArray)),
+        QObject::connect(channelObject, SIGNAL(sendDatagram(QByteArray)),
                         rtpComponent, SLOT(sendDatagram(QByteArray)));
-        Q_ASSERT(check);
     }
     return stream;
 }
@@ -445,7 +439,7 @@ void QXmppCallPrivate::terminate(QXmppJingleIq::Reason::Type reasonType)
     setState(QXmppCall::DisconnectingState);
 
     // schedule forceful termination in 5s
-    QTimer::singleShot(5000, q, SLOT(terminated()));
+    QTimer::singleShot(5000, q, &QXmppCall::terminated);
 }
 
 QXmppCall::QXmppCall(const QString &jid, QXmppCall::Direction direction, QXmppCallManager *parent)
@@ -761,22 +755,17 @@ bool QXmppCallManager::handleStanza(const QDomElement &element)
 
 void QXmppCallManager::setClient(QXmppClient *client)
 {
-    bool check;
-    Q_UNUSED(check);
 
     QXmppClientExtension::setClient(client);
 
-    check = connect(client, SIGNAL(disconnected()),
-                    this, SLOT(_q_disconnected()));
-    Q_ASSERT(check);
+    connect(client, &QXmppClient::disconnected,
+                    this, &QXmppCallManager::_q_disconnected);
 
-    check = connect(client, SIGNAL(iqReceived(QXmppIq)),
-                    this, SLOT(_q_iqReceived(QXmppIq)));
-    Q_ASSERT(check);
+    connect(client, &QXmppClient::iqReceived,
+                    this, &QXmppCallManager::_q_iqReceived);
 
-    check = connect(client, SIGNAL(presenceReceived(QXmppPresence)),
-                    this, SLOT(_q_presenceReceived(QXmppPresence)));
-    Q_ASSERT(check);
+    connect(client, &QXmppClient::presenceReceived,
+                    this, &QXmppCallManager::_q_presenceReceived);
 }
 /// \endcond
 
@@ -786,8 +775,6 @@ void QXmppCallManager::setClient(QXmppClient *client)
 
 QXmppCall *QXmppCallManager::call(const QString &jid)
 {
-    bool check;
-    Q_UNUSED(check);
 
     if (jid.isEmpty()) {
         warning("Refusing to call an empty jid");
@@ -804,9 +791,8 @@ QXmppCall *QXmppCallManager::call(const QString &jid)
 
     // register call
     d->calls << call;
-    check = connect(call, SIGNAL(destroyed(QObject*)),
-                    this, SLOT(_q_callDestroyed(QObject*)));
-    Q_ASSERT(check);
+    connect(call, &QObject::destroyed,
+                    this, &QXmppCallManager::_q_callDestroyed);
     emit callStarted(call);
 
     call->d->sendInvite();
@@ -888,8 +874,6 @@ void QXmppCallManager::_q_iqReceived(const QXmppIq &ack)
 
 void QXmppCallManager::_q_jingleIqReceived(const QXmppJingleIq &iq)
 {
-    bool check;
-    Q_UNUSED(check);
 
     if (iq.type() != QXmppIq::Set)
         return;
@@ -923,9 +907,8 @@ void QXmppCallManager::_q_jingleIqReceived(const QXmppJingleIq &iq)
 
         // register call
         d->calls << call;
-        check = connect(call, SIGNAL(destroyed(QObject*)),
-                        this, SLOT(_q_callDestroyed(QObject*)));
-        Q_ASSERT(check);
+        connect(call, &QObject::destroyed,
+                        this, &QXmppCallManager::_q_callDestroyed);
 
         // send ringing indication
         QXmppJingleIq ringing;
diff --git a/src/client/QXmppClient.cpp b/src/client/QXmppClient.cpp
index 39f48a0f..523a9e79 100644
--- a/src/client/QXmppClient.cpp
+++ b/src/client/QXmppClient.cpp
@@ -106,54 +106,42 @@ QXmppClient::QXmppClient(QObject *parent)
     : QXmppLoggable(parent),
     d(new QXmppClientPrivate(this))
 {
-    bool check;
-    Q_UNUSED(check);
 
     d->stream = new QXmppOutgoingClient(this);
     d->addProperCapability(d->clientPresence);
 
-    check = connect(d->stream, SIGNAL(elementReceived(QDomElement,bool&)),
-                    this, SLOT(_q_elementReceived(QDomElement,bool&)));
-    Q_ASSERT(check);
+    connect(d->stream, &QXmppOutgoingClient::elementReceived,
+                    this, &QXmppClient::_q_elementReceived);
 
-    check = connect(d->stream, SIGNAL(messageReceived(QXmppMessage)),
-                    this, SIGNAL(messageReceived(QXmppMessage)));
-    Q_ASSERT(check);
+    connect(d->stream, &QXmppOutgoingClient::messageReceived,
+                    this, &QXmppClient::messageReceived);
 
-    check = connect(d->stream, SIGNAL(presenceReceived(QXmppPresence)),
-                    this, SIGNAL(presenceReceived(QXmppPresence)));
-    Q_ASSERT(check);
+    connect(d->stream, &QXmppOutgoingClient::presenceReceived,
+                    this, &QXmppClient::presenceReceived);
 
-    check = connect(d->stream, SIGNAL(iqReceived(QXmppIq)),
-                    this, SIGNAL(iqReceived(QXmppIq)));
-    Q_ASSERT(check);
+    connect(d->stream, &QXmppOutgoingClient::iqReceived,
+                    this, &QXmppClient::iqReceived);
 
-    check = connect(d->stream, SIGNAL(sslErrors(QList<QSslError>)),
-                    this, SIGNAL(sslErrors(QList<QSslError>)));
-    Q_ASSERT(check);
+    connect(d->stream, &QXmppOutgoingClient::sslErrors,
+                    this, &QXmppClient::sslErrors);
 
-    check = connect(d->stream->socket(), SIGNAL(stateChanged(QAbstractSocket::SocketState)),
-                    this, SLOT(_q_socketStateChanged(QAbstractSocket::SocketState)));
-    Q_ASSERT(check);
+    connect(d->stream->socket(), &QAbstractSocket::stateChanged,
+                    this, &QXmppClient::_q_socketStateChanged);
 
-    check = connect(d->stream, SIGNAL(connected()),
-                    this, SLOT(_q_streamConnected()));
-    Q_ASSERT(check);
+    connect(d->stream, &QXmppStream::connected,
+                    this, &QXmppClient::_q_streamConnected);
 
-    check = connect(d->stream, SIGNAL(disconnected()),
-                    this, SLOT(_q_streamDisconnected()));
-    Q_ASSERT(check);
+    connect(d->stream, &QXmppStream::disconnected,
+                    this, &QXmppClient::_q_streamDisconnected);
 
-    check = connect(d->stream, SIGNAL(error(QXmppClient::Error)),
-                    this, SLOT(_q_streamError(QXmppClient::Error)));
-    Q_ASSERT(check);
+    connect(d->stream, &QXmppOutgoingClient::error,
+                    this, &QXmppClient::_q_streamError);
 
     // reconnection
     d->reconnectionTimer = new QTimer(this);
     d->reconnectionTimer->setSingleShot(true);
-    connect(d->reconnectionTimer, SIGNAL(timeout()),
-            this, SLOT(_q_reconnect()));
-    Q_ASSERT(check);
+    connect(d->reconnectionTimer, &QTimer::timeout,
+            this, &QXmppClient::_q_reconnect);
 
     // logging
     setLogger(QXmppLogger::getLogger());
@@ -582,22 +570,22 @@ void QXmppClient::setLogger(QXmppLogger *logger)
 {
     if (logger != d->logger) {
         if (d->logger) {
-            disconnect(this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
-                       d->logger, SLOT(log(QXmppLogger::MessageType,QString)));
-            disconnect(this, SIGNAL(setGauge(QString,double)),
-                       d->logger, SLOT(setGauge(QString,double)));
-            disconnect(this, SIGNAL(updateCounter(QString,qint64)),
-                       d->logger, SLOT(updateCounter(QString,qint64)));
+            disconnect(this, &QXmppLoggable::logMessage,
+                       d->logger, &QXmppLogger::log);
+            disconnect(this, &QXmppLoggable::setGauge,
+                       d->logger, &QXmppLogger::setGauge);
+            disconnect(this, &QXmppLoggable::updateCounter,
+                       d->logger, &QXmppLogger::updateCounter);
         }
 
         d->logger = logger;
         if (d->logger) {
-            connect(this, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
-                    d->logger, SLOT(log(QXmppLogger::MessageType,QString)));
-            connect(this, SIGNAL(setGauge(QString,double)),
-                    d->logger, SLOT(setGauge(QString,double)));
-            connect(this, SIGNAL(updateCounter(QString,qint64)),
-                    d->logger, SLOT(updateCounter(QString,qint64)));
+            connect(this, &QXmppLoggable::logMessage,
+                    d->logger, &QXmppLogger::log);
+            connect(this, &QXmppLoggable::setGauge,
+                    d->logger, &QXmppLogger::setGauge);
+            connect(this, &QXmppLoggable::updateCounter,
+                    d->logger, &QXmppLogger::updateCounter);
         }
 
         emit loggerChanged(d->logger);
diff --git a/src/client/QXmppMucManager.cpp b/src/client/QXmppMucManager.cpp
index 6ddb7851..4c2214ba 100644
--- a/src/client/QXmppMucManager.cpp
+++ b/src/client/QXmppMucManager.cpp
@@ -79,8 +79,8 @@ QXmppMucRoom *QXmppMucManager::addRoom(const QString &roomJid)
     if (!room) {
         room = new QXmppMucRoom(client(), roomJid, this);
         d->rooms.insert(roomJid, room);
-        connect(room, SIGNAL(destroyed(QObject*)),
-            this, SLOT(_q_roomDestroyed(QObject*)));
+        connect(room, &QObject::destroyed,
+            this, &QXmppMucManager::_q_roomDestroyed);
 
         // emit signal
         emit roomAdded(room);
@@ -146,14 +146,11 @@ bool QXmppMucManager::handleStanza(const QDomElement &element)
 
 void QXmppMucManager::setClient(QXmppClient* client)
 {
-    bool check;
-    Q_UNUSED(check);
 
     QXmppClientExtension::setClient(client);
 
-    check = connect(client, SIGNAL(messageReceived(QXmppMessage)),
-                    this, SLOT(_q_messageReceived(QXmppMessage)));
-    Q_ASSERT(check);
+    connect(client, &QXmppClient::messageReceived,
+                    this, &QXmppMucManager::_q_messageReceived);
 }
 /// \endcond
 
@@ -182,8 +179,6 @@ void QXmppMucManager::_q_roomDestroyed(QObject *object)
 QXmppMucRoom::QXmppMucRoom(QXmppClient *client, const QString &jid, QObject *parent)
     : QObject(parent)
 {
-    bool check;
-    Q_UNUSED(check);
 
     d = new QXmppMucRoomPrivate;
     d->allowedActions = NoAction;
@@ -191,30 +186,24 @@ QXmppMucRoom::QXmppMucRoom(QXmppClient *client, const QString &jid, QObject *par
     d->discoManager = client->findExtension<QXmppDiscoveryManager>();
     d->jid = jid;
 
-    check = connect(d->client, SIGNAL(disconnected()),
-                    this, SLOT(_q_disconnected()));
-    Q_ASSERT(check);
+    connect(d->client, &QXmppClient::disconnected,
+                    this, &QXmppMucRoom::_q_disconnected);
 
-    check = connect(d->client, SIGNAL(messageReceived(QXmppMessage)),
-                    this, SLOT(_q_messageReceived(QXmppMessage)));
-    Q_ASSERT(check);
+    connect(d->client, &QXmppClient::messageReceived,
+                    this, &QXmppMucRoom::_q_messageReceived);
 
-    check = connect(d->client, SIGNAL(presenceReceived(QXmppPresence)),
-                    this, SLOT(_q_presenceReceived(QXmppPresence)));
-    Q_ASSERT(check);
+    connect(d->client, &QXmppClient::presenceReceived,
+                    this, &QXmppMucRoom::_q_presenceReceived);
 
     if (d->discoManager) {
-        check = connect(d->discoManager, SIGNAL(infoReceived(QXmppDiscoveryIq)),
-                        this, SLOT(_q_discoveryInfoReceived(QXmppDiscoveryIq)));
-        Q_ASSERT(check);
+        connect(d->discoManager, &QXmppDiscoveryManager::infoReceived,
+                        this, &QXmppMucRoom::_q_discoveryInfoReceived);
     }
 
     // convenience signals for properties
-    check = connect(this, SIGNAL(joined()), this, SIGNAL(isJoinedChanged()));
-    Q_ASSERT(check);
+    connect(this, &QXmppMucRoom::joined, this, &QXmppMucRoom::isJoinedChanged);
 
-    check = connect(this, SIGNAL(left()), this, SIGNAL(isJoinedChanged()));
-    Q_ASSERT(check);
+    connect(this, &QXmppMucRoom::left, this, &QXmppMucRoom::isJoinedChanged);
 }
 
 /// Destroys a QXmppMucRoom.
diff --git a/src/client/QXmppOutgoingClient.cpp b/src/client/QXmppOutgoingClient.cpp
index 764ed25f..1b73542e 100644
--- a/src/client/QXmppOutgoingClient.cpp
+++ b/src/client/QXmppOutgoingClient.cpp
@@ -183,49 +183,27 @@ QXmppOutgoingClient::QXmppOutgoingClient(QObject *parent)
     : QXmppStream(parent),
     d(new QXmppOutgoingClientPrivate(this))
 {
-    bool check;
-    Q_UNUSED(check);
-
     // initialise socket
     auto *socket = new QSslSocket(this);
     setSocket(socket);
 
-    check = connect(socket, SIGNAL(disconnected()),
-                    this, SLOT(_q_socketDisconnected()));
-    Q_ASSERT(check);
-
-    check = connect(socket, SIGNAL(sslErrors(QList<QSslError>)),
-                    this, SLOT(socketSslErrors(QList<QSslError>)));
-    Q_ASSERT(check);
-
-    check = connect(socket, SIGNAL(error(QAbstractSocket::SocketError)),
-                    this, SLOT(socketError(QAbstractSocket::SocketError)));
-    Q_ASSERT(check);
+    connect(socket, &QAbstractSocket::disconnected, this, &QXmppOutgoingClient::_q_socketDisconnected);
+    connect(socket, QOverload<const QList<QSslError> &>::of(&QSslSocket::sslErrors), this, &QXmppOutgoingClient::socketSslErrors);
+    connect(socket, QOverload<QAbstractSocket::SocketError>::of(&QSslSocket::error), this, &QXmppOutgoingClient::socketError);
 
     // DNS lookups
-    check = connect(&d->dns, SIGNAL(finished()),
-                    this, SLOT(_q_dnsLookupFinished()));
-    Q_ASSERT(check);
+    connect(&d->dns, &QDnsLookup::finished, this, &QXmppOutgoingClient::_q_dnsLookupFinished);
 
     // XEP-0199: XMPP Ping
     d->pingTimer = new QTimer(this);
-    check = connect(d->pingTimer, SIGNAL(timeout()),
-                    this, SLOT(pingSend()));
-    Q_ASSERT(check);
+    connect(d->pingTimer, &QTimer::timeout, this, &QXmppOutgoingClient::pingSend);
 
     d->timeoutTimer = new QTimer(this);
     d->timeoutTimer->setSingleShot(true);
-    check = connect(d->timeoutTimer, SIGNAL(timeout()),
-                    this, SLOT(pingTimeout()));
-    Q_ASSERT(check);
-
-    check = connect(this, SIGNAL(connected()),
-                    this, SLOT(pingStart()));
-    Q_ASSERT(check);
+    connect(d->timeoutTimer, &QTimer::timeout, this, &QXmppOutgoingClient::pingTimeout);
 
-    check = connect(this, SIGNAL(disconnected()),
-                    this, SLOT(pingStop()));
-    Q_ASSERT(check);
+    connect(this, &QXmppStream::connected, this, &QXmppOutgoingClient::pingStart);
+    connect(this, &QXmppStream::disconnected, this, &QXmppOutgoingClient::pingStop);
 }
 
 /// Destroys an outgoing client stream.
diff --git a/src/client/QXmppRemoteMethod.cpp b/src/client/QXmppRemoteMethod.cpp
index 2f300cc8..da3b97f6 100644
--- a/src/client/QXmppRemoteMethod.cpp
+++ b/src/client/QXmppRemoteMethod.cpp
@@ -43,8 +43,8 @@ QXmppRemoteMethodResult QXmppRemoteMethod::call( )
     // FIXME : spinning an event loop is a VERY bad idea, it can cause
     // us to lose incoming packets
     QEventLoop loop(this);
-    connect( this, SIGNAL(callDone()), &loop, SLOT(quit()));
-    QTimer::singleShot(30000,&loop, SLOT(quit())); // Timeout in case the other end hangs...
+    connect( this, &QXmppRemoteMethod::callDone, &loop, &QEventLoop::quit);
+    QTimer::singleShot(30000,&loop, &QEventLoop::quit); // Timeout in case the other end hangs...
 
     m_client->sendPacket( m_payload );
 
diff --git a/src/client/QXmppRosterManager.cpp b/src/client/QXmppRosterManager.cpp
index 787815cf..041d1851 100644
--- a/src/client/QXmppRosterManager.cpp
+++ b/src/client/QXmppRosterManager.cpp
@@ -61,22 +61,17 @@ QXmppRosterManagerPrivate::QXmppRosterManagerPrivate(QXmppRosterManager *qq)
 
 QXmppRosterManager::QXmppRosterManager(QXmppClient* client)
 {
-    bool check;
-    Q_UNUSED(check);
 
     d = new QXmppRosterManagerPrivate(this);
 
-    check = connect(client, SIGNAL(connected()),
-                    this, SLOT(_q_connected()));
-    Q_ASSERT(check);
+    connect(client, &QXmppClient::connected,
+                    this, &QXmppRosterManager::_q_connected);
 
-    check = connect(client, SIGNAL(disconnected()),
-                    this, SLOT(_q_disconnected()));
-    Q_ASSERT(check);
+    connect(client, &QXmppClient::disconnected,
+                    this, &QXmppRosterManager::_q_disconnected);
 
-    check = connect(client, SIGNAL(presenceReceived(QXmppPresence)),
-                    this, SLOT(_q_presenceReceived(QXmppPresence)));
-    Q_ASSERT(check);
+    connect(client, &QXmppClient::presenceReceived,
+                    this, &QXmppRosterManager::_q_presenceReceived);
 }
 
 QXmppRosterManager::~QXmppRosterManager()
diff --git a/src/client/QXmppRpcManager.cpp b/src/client/QXmppRpcManager.cpp
index 5cf7737e..0707834a 100644
--- a/src/client/QXmppRpcManager.cpp
+++ b/src/client/QXmppRpcManager.cpp
@@ -128,11 +128,16 @@ QXmppRemoteMethodResult QXmppRpcManager::callRemoteMethod( const QString &jid,
     if( arg9.isValid() ) args << arg9;
     if( arg10.isValid() ) args << arg10;
 
+    bool check;
+    Q_UNUSED(check)
+
     QXmppRemoteMethod method( jid, interface, args, client() );
-    connect(this, SIGNAL(rpcCallResponse(QXmppRpcResponseIq)),
+    check = connect(this, SIGNAL(rpcCallResponse(QXmppRpcResponseIq)),
             &method, SLOT(gotResult(QXmppRpcResponseIq)));
-    connect(this, SIGNAL(rpcCallError(QXmppRpcErrorIq)),
+    Q_ASSERT(check);
+    check = connect(this, SIGNAL(rpcCallError(QXmppRpcErrorIq)),
             &method, SLOT(gotError(QXmppRpcErrorIq)));
+    Q_ASSERT(check);
 
     return method.call();
 }
diff --git a/src/client/QXmppTransferManager.cpp b/src/client/QXmppTransferManager.cpp
index f44d3166..cdcd8689 100644
--- a/src/client/QXmppTransferManager.cpp
+++ b/src/client/QXmppTransferManager.cpp
@@ -28,6 +28,7 @@
 #include <QFileInfo>
 #include <QHash>
 #include <QHostAddress>
+#include <QMetaMethod>
 #include <QNetworkInterface>
 #include <QTime>
 #include <QTimer>
@@ -463,9 +464,6 @@ void QXmppTransferIncomingJob::checkData()
 
 void QXmppTransferIncomingJob::connectToNextHost()
 {
-    bool check;
-    Q_UNUSED(check);
-
     if (m_streamCandidates.isEmpty()) {
         // could not connect to any stream host
         QXmppByteStreamIq response;
@@ -496,17 +494,12 @@ void QXmppTransferIncomingJob::connectToNextHost()
     m_candidateClient = new QXmppSocksClient(m_candidateHost.host(), m_candidateHost.port(), this);
     m_candidateTimer = new QTimer(this);
 
-    check = connect(m_candidateClient, SIGNAL(disconnected()),
-                    this, SLOT(_q_candidateDisconnected()));
-    Q_ASSERT(check);
-
-    check = connect(m_candidateClient, SIGNAL(ready()),
-                    this, SLOT(_q_candidateReady()));
-    Q_ASSERT(check);
-
-    check = connect(m_candidateTimer, SIGNAL(timeout()),
-                    this, SLOT(_q_candidateDisconnected()));
-    Q_ASSERT(check);
+    connect(m_candidateClient, &QAbstractSocket::disconnected,
+            this, &QXmppTransferIncomingJob::_q_candidateDisconnected);
+    connect(m_candidateClient, &QXmppSocksClient::ready,
+            this, &QXmppTransferIncomingJob::_q_candidateReady);
+    connect(m_candidateTimer, &QTimer::timeout,
+            this, &QXmppTransferIncomingJob::_q_candidateDisconnected);
 
     m_candidateTimer->setSingleShot(true);
     m_candidateTimer->start(socksTimeout);
@@ -515,8 +508,6 @@ void QXmppTransferIncomingJob::connectToNextHost()
 
 void QXmppTransferIncomingJob::connectToHosts(const QXmppByteStreamIq &iq)
 {
-    bool check;
-    Q_UNUSED(check);
 
     m_streamCandidates = iq.streamHosts();
     m_streamOfferId = iq.id();
@@ -539,9 +530,6 @@ bool QXmppTransferIncomingJob::writeData(const QByteArray &data)
 
 void QXmppTransferIncomingJob::_q_candidateReady()
 {
-    bool check;
-    Q_UNUSED(check);
-
     if (!m_candidateClient)
         return;
 
@@ -556,13 +544,8 @@ void QXmppTransferIncomingJob::_q_candidateReady()
     m_candidateTimer->deleteLater();
     m_candidateTimer = nullptr;
 
-    check = connect(d->socksSocket, SIGNAL(readyRead()),
-                    this, SLOT(_q_receiveData()));
-    Q_ASSERT(check);
-
-    check = connect(d->socksSocket, SIGNAL(disconnected()),
-                    this, SLOT(_q_disconnected()));
-    Q_ASSERT(check);
+    connect(d->socksSocket, &QIODevice::readyRead, this, &QXmppTransferIncomingJob::_q_receiveData);
+    connect(d->socksSocket, &QAbstractSocket::disconnected, this, &QXmppTransferIncomingJob::_q_disconnected);
 
     QXmppByteStreamIq ackIq;
     ackIq.setId(m_streamOfferId);
@@ -623,9 +606,6 @@ QXmppTransferOutgoingJob::QXmppTransferOutgoingJob(const QString& jid, QXmppClie
 
 void QXmppTransferOutgoingJob::connectToProxy()
 {
-    bool check;
-    Q_UNUSED(check);
-
     info(QString("Connecting to proxy: %1 (%2 %3)").arg(
             d->socksProxy.jid(),
             d->socksProxy.host(),
@@ -637,13 +617,8 @@ void QXmppTransferOutgoingJob::connectToProxy()
 
     QXmppSocksClient *socksClient = new QXmppSocksClient(d->socksProxy.host(), d->socksProxy.port(), this);
 
-    check = connect(socksClient, SIGNAL(disconnected()),
-                    this, SLOT(_q_disconnected()));
-    Q_ASSERT(check);
-
-    check = connect(socksClient, SIGNAL(ready()),
-                    this, SLOT(_q_proxyReady()));
-    Q_ASSERT(check);
+    connect(socksClient, &QAbstractSocket::disconnected, this, &QXmppTransferOutgoingJob::_q_disconnected);
+    connect(socksClient, &QXmppSocksClient::ready, this, &QXmppTransferOutgoingJob::_q_proxyReady);
 
     d->socksSocket = socksClient;
     socksClient->connectToHost(hostName, 0);
@@ -651,18 +626,10 @@ void QXmppTransferOutgoingJob::connectToProxy()
 
 void QXmppTransferOutgoingJob::startSending()
 {
-    bool check;
-    Q_UNUSED(check);
-
     setState(QXmppTransferJob::TransferState);
 
-    check = connect(d->socksSocket, SIGNAL(bytesWritten(qint64)),
-                    this, SLOT(_q_sendData()));
-    Q_ASSERT(check);
-
-    check = connect(d->iodevice, SIGNAL(readyRead()),
-                    this, SLOT(_q_sendData()));
-    Q_ASSERT(check);
+    connect(d->socksSocket, &QIODevice::bytesWritten, this, &QXmppTransferOutgoingJob::_q_sendData);
+    connect(d->iodevice, &QIODevice::readyRead, this, &QXmppTransferOutgoingJob::_q_sendData);
 
     _q_sendData();
 }
@@ -793,16 +760,12 @@ QXmppTransferOutgoingJob *QXmppTransferManagerPrivate::getOutgoingJobByRequestId
 
 QXmppTransferManager::QXmppTransferManager()
 {
-    bool check;
-    Q_UNUSED(check);
-
     d = new QXmppTransferManagerPrivate(this);
 
     // start SOCKS server
     d->socksServer = new QXmppSocksServer(this);
-    check = connect(d->socksServer, SIGNAL(newConnection(QTcpSocket*,QString,quint16)),
-                    this, SLOT(_q_socksServerConnected(QTcpSocket*,QString,quint16)));
-    Q_ASSERT(check);
+    connect(d->socksServer, &QXmppSocksServer::newConnection, this, &QXmppTransferManager::_q_socksServerConnected);
+
     if (!d->socksServer->listen()) {
         qWarning("QXmppSocksServer could not start listening");
     }
@@ -850,9 +813,6 @@ void QXmppTransferManager::byteStreamResponseReceived(const QXmppIq &iq)
 /// a stream host.
 void QXmppTransferManager::byteStreamResultReceived(const QXmppByteStreamIq &iq)
 {
-    bool check;
-    Q_UNUSED(check);
-
     QXmppTransferOutgoingJob *job = d->getOutgoingJobByRequestId(iq.from(), iq.id());
     if (!job ||
         job->method() != QXmppTransferJob::SocksMethod ||
@@ -873,10 +833,8 @@ void QXmppTransferManager::byteStreamResultReceived(const QXmppByteStreamIq &iq)
         job->terminate(QXmppTransferJob::ProtocolError);
         return;
     }
-    check = connect(job->d->socksSocket, SIGNAL(disconnected()),
-                    job, SLOT(_q_disconnected()));
-    Q_ASSERT(check);
-
+    
+    connect(job->d->socksSocket, &QTcpSocket::disconnected, job, &QXmppTransferOutgoingJob::_q_disconnected);
     job->startSending();
 }
 
@@ -884,8 +842,6 @@ void QXmppTransferManager::byteStreamResultReceived(const QXmppByteStreamIq &iq)
 /// to a stream host.
 void QXmppTransferManager::byteStreamSetReceived(const QXmppByteStreamIq &iq)
 {
-    bool check;
-    Q_UNUSED(check);
 
     QXmppIq response;
     response.setId(iq.id());
@@ -967,15 +923,10 @@ bool QXmppTransferManager::handleStanza(const QDomElement &element)
 
 void QXmppTransferManager::setClient(QXmppClient *client)
 {
-    bool check;
-    Q_UNUSED(check);
-
     QXmppClientExtension::setClient(client);
 
     // XEP-0047: In-Band Bytestreams
-    check = connect(client, SIGNAL(iqReceived(QXmppIq)),
-                    this, SLOT(_q_iqReceived(QXmppIq)));
-    Q_ASSERT(check);
+    connect(client, &QXmppClient::iqReceived, this, &QXmppTransferManager::_q_iqReceived);
 }
 /// \endcond
 
@@ -1134,8 +1085,6 @@ void QXmppTransferManager::ibbResponseReceived(const QXmppIq &iq)
 
 void QXmppTransferManager::_q_iqReceived(const QXmppIq &iq)
 {
-    bool check;
-    Q_UNUSED(check);
 
     for (auto *ptr : d->jobs) {
         // handle IQ from proxy
@@ -1222,9 +1171,6 @@ void QXmppTransferManager::_q_jobFinished()
 
 void QXmppTransferManager::_q_jobStateChanged(QXmppTransferJob::State state)
 {
-    bool check;
-    Q_UNUSED(check);
-
     auto *job = qobject_cast<QXmppTransferJob *>(sender());
     if (!job || !d->jobs.contains(job))
         return;
@@ -1233,8 +1179,8 @@ void QXmppTransferManager::_q_jobStateChanged(QXmppTransferJob::State state)
         return;
 
     // disconnect from the signal
-    disconnect(job, SIGNAL(stateChanged(QXmppTransferJob::State)),
-               this, SLOT(_q_jobStateChanged(QXmppTransferJob::State)));
+    disconnect(job, &QXmppTransferJob::stateChanged,
+               this, &QXmppTransferManager::_q_jobStateChanged);
 
     // the job was refused by the local party
     if (state != QXmppTransferJob::StartState || !job->d->iodevice || !job->d->iodevice->isWritable())
@@ -1254,9 +1200,7 @@ void QXmppTransferManager::_q_jobStateChanged(QXmppTransferJob::State state)
     }
 
     // the job was accepted by the local party
-    check = connect(job, SIGNAL(error(QXmppTransferJob::Error)),
-            this, SLOT(_q_jobError(QXmppTransferJob::Error)));
-    Q_ASSERT(check);
+    connect(job, QOverload<QXmppTransferJob::Error>::of(&QXmppTransferJob::error), this, &QXmppTransferManager::_q_jobError);
 
     QXmppDataForm form;
     form.setType(QXmppDataForm::Submit);
@@ -1348,9 +1292,6 @@ QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, const QStri
 
 QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, QIODevice *device, const QXmppTransferFileInfo &fileInfo, const QString &sid)
 {
-    bool check;
-    Q_UNUSED(check);
-
     if (QXmppUtils::jidToResource(jid).isEmpty()) {
         warning("The file recipient's JID must be a full JID");
         return nullptr;
@@ -1392,17 +1333,10 @@ QXmppTransferJob *QXmppTransferManager::sendFile(const QString &jid, QIODevice *
 
     // start job
     d->jobs.append(job);
-    check = connect(job, SIGNAL(destroyed(QObject*)),
-                    this, SLOT(_q_jobDestroyed(QObject*)));
-    Q_ASSERT(check);
-
-    check = connect(job, SIGNAL(error(QXmppTransferJob::Error)),
-                    this, SLOT(_q_jobError(QXmppTransferJob::Error)));
-    Q_ASSERT(check);
 
-    check = connect(job, SIGNAL(finished()),
-                    this, SLOT(_q_jobFinished()));
-    Q_ASSERT(check);
+    connect(job, &QObject::destroyed, this, &QXmppTransferManager::_q_jobDestroyed);    
+    connect(job, QOverload<QXmppTransferJob::Error>::of(&QXmppTransferJob::error), this, &QXmppTransferManager::_q_jobError);
+    connect(job, &QXmppTransferJob::finished, this, &QXmppTransferManager::_q_jobFinished);
 
     QXmppStreamInitiationIq request;
     request.setType(QXmppIq::Set);
@@ -1536,9 +1470,6 @@ void QXmppTransferManager::streamInitiationResultReceived(const QXmppStreamIniti
 
 void QXmppTransferManager::streamInitiationSetReceived(const QXmppStreamInitiationIq &iq)
 {
-    bool check;
-    Q_UNUSED(check);
-
     QXmppIq response;
     response.setTo(iq.from());
     response.setId(iq.id());
@@ -1558,8 +1489,7 @@ void QXmppTransferManager::streamInitiationSetReceived(const QXmppStreamInitiati
     }
 
     // check there is a receiver connected to the fileReceived() signal
-    if (!receivers(SIGNAL(fileReceived(QXmppTransferJob*))))
-    {
+    if (!isSignalConnected(QMetaMethod::fromSignal(&QXmppTransferManager::fileReceived))) {
         QXmppStanza::Error error(QXmppStanza::Error::Cancel, QXmppStanza::Error::Forbidden);
         error.setCode(403);
 
@@ -1613,17 +1543,10 @@ void QXmppTransferManager::streamInitiationSetReceived(const QXmppStreamInitiati
 
     // register job
     d->jobs.append(job);
-    check = connect(job, SIGNAL(destroyed(QObject*)),
-                    this, SLOT(_q_jobDestroyed(QObject*)));
-    Q_ASSERT(check);
-
-    check = connect(job, SIGNAL(finished()),
-                    this, SLOT(_q_jobFinished()));
-    Q_ASSERT(check);
 
-    check = connect(job, SIGNAL(stateChanged(QXmppTransferJob::State)),
-                    this, SLOT(_q_jobStateChanged(QXmppTransferJob::State)));
-    Q_ASSERT(check);
+    connect(job, &QObject::destroyed, this, &QXmppTransferManager::_q_jobDestroyed);
+    connect(job, &QXmppTransferJob::finished, this, &QXmppTransferManager::_q_jobFinished);
+    connect(job, &QXmppTransferJob::stateChanged, this, &QXmppTransferManager::_q_jobStateChanged);
 
     // allow user to accept or decline the job
     emit fileReceived(job);
diff --git a/src/client/QXmppTransferManager_p.h b/src/client/QXmppTransferManager_p.h
index 8bc007fd..cf44f4d3 100644
--- a/src/client/QXmppTransferManager_p.h
+++ b/src/client/QXmppTransferManager_p.h
@@ -77,8 +77,10 @@ public:
     void connectToProxy();
     void startSending();
 
-private slots:
+public slots:
     void _q_disconnected();
+
+private slots:
     void _q_proxyReady();
     void _q_sendData();
 };