Port majority of old-style connects (#237)

This provides more type safety and is future-proof.

1 files changed, 14 insertions, 31 deletions

diff --git a/examples/example_3_transferHandling/example_3_transferHandling.cpp b/examples/example_3_transferHandling/example_3_transferHandling.cpp
index cd909787..c533fd18 100644
--- a/examples/example_3_transferHandling/example_3_transferHandling.cpp
+++ b/examples/example_3_transferHandling/example_3_transferHandling.cpp
@@ -37,8 +37,6 @@
 xmppClient::xmppClient(QObject *parent)
     : QXmppClient(parent), transferManager(nullptr)
 {
-    bool check;
-    Q_UNUSED(check);
 
     // add transfer manager
     transferManager = new QXmppTransferManager;
@@ -50,13 +48,11 @@ xmppClient::xmppClient(QObject *parent)
     // transferManager->setSupportedMethods(QXmppTransferJob::InBandMethod);
     // transferManager->setSupportedMethods(QXmppTransferJob::SocksMethod);
 
-    check = connect(this, SIGNAL(presenceReceived(QXmppPresence)),
-                    this, SLOT(slotPresenceReceived(QXmppPresence)));
-    Q_ASSERT(check);
+    connect(this, &QXmppClient::presenceReceived,
+                    this, &xmppClient::slotPresenceReceived);
 
-    check = connect(transferManager, SIGNAL(fileReceived(QXmppTransferJob*)),
-                    this, SLOT(slotFileReceived(QXmppTransferJob*)));
-    Q_ASSERT(check);
+    connect(transferManager, &QXmppTransferManager::fileReceived,
+                    this, &xmppClient::slotFileReceived);
 }
 
 void xmppClient::setRecipient(const QString &recipient)
@@ -75,22 +71,16 @@ void xmppClient::slotError(QXmppTransferJob::Error error)
 
 void xmppClient::slotFileReceived(QXmppTransferJob *job)
 {
-    bool check;
-    Q_UNUSED(check);
-
     qDebug() << "Got transfer request from:" << job->jid();
 
-    check = connect(job, SIGNAL(error(QXmppTransferJob::Error)),
+    connect(job, SIGNAL(error(QXmppTransferJob::Error)),
                     this, SLOT(slotError(QXmppTransferJob::Error)));
-    Q_ASSERT(check);
 
-    check = connect(job, SIGNAL(finished()),
-                    this, SLOT(slotFinished()));
-    Q_ASSERT(check);
+    connect(job, &QXmppTransferJob::finished,
+                    this, &xmppClient::slotFinished);
 
-    check = connect(job, SIGNAL(progress(qint64,qint64)),
-                    this, SLOT(slotProgress(qint64,qint64)));
-    Q_ASSERT(check);
+    connect(job, &QXmppTransferJob::progress,
+                    this, &xmppClient::slotProgress);
 
     // allocate a buffer to receive the file
     auto *buffer = new QBuffer(this);
@@ -109,9 +99,6 @@ void xmppClient::slotFinished()
 
 void xmppClient::slotPresenceReceived(const QXmppPresence &presence)
 {
-    bool check;
-    Q_UNUSED(check);
-
     // if we don't have a recipient, or if the presence is not from the recipient,
     // do nothing
     if (m_recipient.isEmpty() ||
@@ -122,17 +109,13 @@ void xmppClient::slotPresenceReceived(const QXmppPresence &presence)
     // send the file and connect to the job's signals
     QXmppTransferJob *job = transferManager->sendFile(presence.from(), ":/example_3_transferHandling.cpp", "example source code");
 
-    check = connect(job, SIGNAL(error(QXmppTransferJob::Error)),
+    connect(job, SIGNAL(error(QXmppTransferJob::Error)),
                     this, SLOT(slotError(QXmppTransferJob::Error)));
-    Q_ASSERT(check);
-
-    check = connect(job, SIGNAL(finished()),
-                    this, SLOT(slotFinished()));
-    Q_ASSERT(check);
+    connect(job, &QXmppTransferJob::finished,
+                    this, &xmppClient::slotFinished);
 
-    check = connect(job, SIGNAL(progress(qint64,qint64)),
-                    this, SLOT(slotProgress(qint64,qint64)));
-    Q_ASSERT(check);
+    connect(job, &QXmppTransferJob::progress,
+                    this, &xmppClient::slotProgress);
 }
 
 /// A file transfer has made progress.