Port majority of old-style connects (#237)

This provides more type safety and is future-proof.

1 files changed, 23 insertions, 40 deletions

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;