Port majority of old-style connects (#237)

This provides more type safety and is future-proof.

7 files changed, 52 insertions, 52 deletions

diff --git a/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp b/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp
index ca0eec8b..908c5450 100644
--- a/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp
+++ b/tests/qxmppcallmanager/tst_qxmppcallmanager.cpp
@@ -80,8 +80,8 @@ void tst_QXmppCallManager::testCall()
     sender.setLogger(&logger);
 
     QEventLoop senderLoop;
-    connect(&sender, SIGNAL(connected()), &senderLoop, SLOT(quit()));
-    connect(&sender, SIGNAL(disconnected()), &senderLoop, SLOT(quit()));
+    connect(&sender, &QXmppClient::connected, &senderLoop, &QEventLoop::quit);
+    connect(&sender, &QXmppClient::disconnected, &senderLoop, &QEventLoop::quit);
 
     QXmppConfiguration config;
     config.setDomain(testDomain);
@@ -96,14 +96,14 @@ void tst_QXmppCallManager::testCall()
     // prepare receiver
     QXmppClient receiver;
     auto *receiverManager = new QXmppCallManager;
-    connect(receiverManager, SIGNAL(callReceived(QXmppCall*)),
-            this, SLOT(acceptCall(QXmppCall*)));
+    connect(receiverManager, &QXmppCallManager::callReceived,
+            this, &tst_QXmppCallManager::acceptCall);
     receiver.addExtension(receiverManager);
     receiver.setLogger(&logger);
 
     QEventLoop receiverLoop;
-    connect(&receiver, SIGNAL(connected()), &receiverLoop, SLOT(quit()));
-    connect(&receiver, SIGNAL(disconnected()), &receiverLoop, SLOT(quit()));
+    connect(&receiver, &QXmppClient::connected, &receiverLoop, &QEventLoop::quit);
+    connect(&receiver, &QXmppClient::disconnected, &receiverLoop, &QEventLoop::quit);
 
     config.setUser("receiver");
     config.setPassword("testpwd");
@@ -116,7 +116,7 @@ void tst_QXmppCallManager::testCall()
     QEventLoop loop;
     QXmppCall *senderCall = senderManager->call("receiver@localhost/QXmpp");
     QVERIFY(senderCall);
-    connect(senderCall, SIGNAL(connected()), &loop, SLOT(quit()));
+    connect(senderCall, &QXmppCall::connected, &loop, &QEventLoop::quit);
     loop.exec();
     QVERIFY(receiverCall);
 
@@ -128,12 +128,12 @@ void tst_QXmppCallManager::testCall()
 
     // exchange some media
     qDebug() << "======== TALK ========";
-    QTimer::singleShot(2000, &loop, SLOT(quit()));
+    QTimer::singleShot(2000, &loop, &QEventLoop::quit);
     loop.exec();
 
     // hangup call
     qDebug() << "======== HANGUP ========";
-    connect(senderCall, SIGNAL(finished()), &loop, SLOT(quit()));
+    connect(senderCall, &QXmppCall::finished, &loop, &QEventLoop::quit);
     senderCall->hangup();
     loop.exec();
 
diff --git a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
index 65d31234..2f4f9357 100644
--- a/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
+++ b/tests/qxmppcarbonmanager/tst_qxmppcarbonmanager.cpp
@@ -62,11 +62,11 @@ private:
 
 void tst_QXmppCarbonManager::initTestCase()
 {
-    connect(&m_manager, SIGNAL(messageSent(const QXmppMessage&)),
-            &m_helper, SLOT(messageSent(const QXmppMessage&)));
+    connect(&m_manager, &QXmppCarbonManager::messageSent,
+            &m_helper, &QXmppCarbonTestHelper::messageSent);
 
-    connect(&m_manager, SIGNAL(messageReceived(const QXmppMessage&)),
-            &m_helper, SLOT(messageReceived(const QXmppMessage&)));
+    connect(&m_manager, &QXmppCarbonManager::messageReceived,
+            &m_helper, &QXmppCarbonTestHelper::messageReceived);
 }
 
 void tst_QXmppCarbonManager::testHandleStanza_data()
diff --git a/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp b/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp
index b5b1392b..57cde0e2 100644
--- a/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp
+++ b/tests/qxmppiceconnection/tst_qxmppiceconnection.cpp
@@ -43,8 +43,8 @@ void tst_QXmppIceConnection::testBind()
     logger.setLoggingType(QXmppLogger::StdoutLogging);
 
     QXmppIceConnection client;
-    connect(&client, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
-            &logger, SLOT(log(QXmppLogger::MessageType,QString)));
+    connect(&client, &QXmppLoggable::logMessage,
+            &logger, &QXmppLogger::log);
     client.setIceControlling(true);
     client.addComponent(componentId);
 
@@ -74,8 +74,8 @@ void tst_QXmppIceConnection::testBindStun()
     QVERIFY(!stunInfo.addresses().isEmpty());
 
     QXmppIceConnection client;
-    connect(&client, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
-            &logger, SLOT(log(QXmppLogger::MessageType,QString)));
+    connect(&client, &QXmppLoggable::logMessage,
+            &logger, &QXmppLogger::log);
     client.setIceControlling(true);
     client.setStunServer(stunInfo.addresses().first(), 19302);
     client.addComponent(componentId);
@@ -88,8 +88,8 @@ void tst_QXmppIceConnection::testBindStun()
     QCOMPARE(client.gatheringState(), QXmppIceConnection::BusyGatheringState);
 
     QEventLoop loop;
-    connect(&client, SIGNAL(gatheringStateChanged()),
-            &loop, SLOT(quit()));
+    connect(&client, &QXmppIceConnection::gatheringStateChanged,
+            &loop, &QEventLoop::quit);
     loop.exec();
 
     bool foundReflexive = false;
@@ -115,15 +115,15 @@ void tst_QXmppIceConnection::testConnect()
     logger.setLoggingType(QXmppLogger::StdoutLogging);
 
     QXmppIceConnection clientL;
-    connect(&clientL, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
-            &logger, SLOT(log(QXmppLogger::MessageType,QString)));
+    connect(&clientL, &QXmppLoggable::logMessage,
+            &logger, &QXmppLogger::log);
     clientL.setIceControlling(true);
     clientL.addComponent(componentId);
     clientL.bind(QXmppIceComponent::discoverAddresses());
 
     QXmppIceConnection clientR;
-    connect(&clientR, SIGNAL(logMessage(QXmppLogger::MessageType,QString)),
-            &logger, SLOT(log(QXmppLogger::MessageType,QString)));
+    connect(&clientR, &QXmppLoggable::logMessage,
+            &logger, &QXmppLogger::log);
     clientR.setIceControlling(false);
     clientR.addComponent(componentId);
     clientR.bind(QXmppIceComponent::discoverAddresses());
@@ -144,8 +144,8 @@ void tst_QXmppIceConnection::testConnect()
 
     // start ICE
     QEventLoop loop;
-    connect(&clientL, SIGNAL(connected()), &loop, SLOT(quit()));
-    connect(&clientR, SIGNAL(connected()), &loop, SLOT(quit()));
+    connect(&clientL, &QXmppIceConnection::connected, &loop, &QEventLoop::quit);
+    connect(&clientR, &QXmppIceConnection::connected, &loop, &QEventLoop::quit);
 
     clientL.connectToHost();
     clientR.connectToHost();
diff --git a/tests/qxmppmammanager/tst_qxmppmammanager.cpp b/tests/qxmppmammanager/tst_qxmppmammanager.cpp
index 40c312e3..3d32a3e1 100644
--- a/tests/qxmppmammanager/tst_qxmppmammanager.cpp
+++ b/tests/qxmppmammanager/tst_qxmppmammanager.cpp
@@ -65,11 +65,11 @@ private:
 
 void tst_QXmppMamManager::initTestCase()
 {
-    connect(&m_manager, SIGNAL(archivedMessageReceived(const QString&, const QXmppMessage&)),
-            &m_helper, SLOT(archivedMessageReceived(const QString&, const QXmppMessage&)));
+    connect(&m_manager, &QXmppMamManager::archivedMessageReceived,
+            &m_helper, &QXmppMamTestHelper::archivedMessageReceived);
 
-    connect(&m_manager, SIGNAL(resultsRecieved(const QString&, const QXmppResultSetReply&, bool)),
-            &m_helper, SLOT(resultsRecieved(const QString&, const QXmppResultSetReply&, bool)));
+    connect(&m_manager, &QXmppMamManager::resultsRecieved,
+            &m_helper, &QXmppMamTestHelper::resultsRecieved);
 }
 
 void tst_QXmppMamManager::testHandleStanza_data()
diff --git a/tests/qxmppserver/tst_qxmppserver.cpp b/tests/qxmppserver/tst_qxmppserver.cpp
index 496bdd1c..6edc4eff 100644
--- a/tests/qxmppserver/tst_qxmppserver.cpp
+++ b/tests/qxmppserver/tst_qxmppserver.cpp
@@ -79,10 +79,10 @@ void tst_QXmppServer::testConnect()
     client.setLogger(&logger);
 
     QEventLoop loop;
-    connect(&client, SIGNAL(connected()),
-            &loop, SLOT(quit()));
-    connect(&client, SIGNAL(disconnected()),
-            &loop, SLOT(quit()));
+    connect(&client, &QXmppClient::connected,
+            &loop, &QEventLoop::quit);
+    connect(&client, &QXmppClient::disconnected,
+            &loop, &QEventLoop::quit);
 
     QXmppConfiguration config;
     config.setDomain(testDomain);
diff --git a/tests/qxmppsocks/tst_qxmppsocks.cpp b/tests/qxmppsocks/tst_qxmppsocks.cpp
index f29f60e1..9861891c 100644
--- a/tests/qxmppsocks/tst_qxmppsocks.cpp
+++ b/tests/qxmppsocks/tst_qxmppsocks.cpp
@@ -102,7 +102,7 @@ void tst_QXmppSocks::testClient()
     QXmppSocksClient client("127.0.0.1", server.serverPort());
 
     QEventLoop loop;
-    connect(&server, SIGNAL(newConnection()), &loop, SLOT(quit()));
+    connect(&server, &QTcpServer::newConnection, &loop, &QEventLoop::quit);
 
     client.connectToHost("www.google.com", 80);
     loop.exec();
@@ -111,8 +111,8 @@ void tst_QXmppSocks::testClient()
     m_connectionSocket = server.nextPendingConnection();
     QVERIFY(m_connectionSocket);
 
-    connect(m_connectionSocket, SIGNAL(disconnected()), &loop, SLOT(quit()));
-    connect(m_connectionSocket, SIGNAL(readyRead()), &loop, SLOT(quit()));
+    connect(m_connectionSocket, &QAbstractSocket::disconnected, &loop, &QEventLoop::quit);
+    connect(m_connectionSocket, &QIODevice::readyRead, &loop, &QEventLoop::quit);
     loop.exec();
     QCOMPARE(client.state(), QAbstractSocket::ConnectedState);
     QCOMPARE(m_connectionSocket->state(), QAbstractSocket::ConnectedState);
@@ -132,7 +132,7 @@ void tst_QXmppSocks::testClient()
     QCOMPARE(m_connectionSocket->readAll(), QByteArray::fromHex("050100030e7777772e676f6f676c652e636f6d0050"));
 
     // wait for client to be ready
-    connect(&client, SIGNAL(ready()), &loop, SLOT(quit()));
+    connect(&client, &QXmppSocksClient::ready, &loop, &QEventLoop::quit);
     m_connectionSocket->write(serverConnect);
     loop.exec();
     if  (!serverConnectWorks) {
@@ -155,13 +155,13 @@ void tst_QXmppSocks::testClientAndServer()
     QXmppSocksServer server;
     QVERIFY(server.listen());
     QVERIFY(server.serverPort() != 0);
-    connect(&server, SIGNAL(newConnection(QTcpSocket*,QString,quint16)),
-            this, SLOT(newConnectionSlot(QTcpSocket*,QString,quint16)));
+    connect(&server, &QXmppSocksServer::newConnection,
+            this, &tst_QXmppSocks::newConnectionSlot);
 
     QXmppSocksClient client("127.0.0.1", server.serverPort());
 
     QEventLoop loop;
-    connect(&client, SIGNAL(ready()), &loop, SLOT(quit()));
+    connect(&client, &QXmppSocksClient::ready, &loop, &QEventLoop::quit);
   
     client.connectToHost("www.google.com", 80);
     loop.exec();
@@ -217,16 +217,16 @@ void tst_QXmppSocks::testServer()
     QXmppSocksServer server;
     QVERIFY(server.listen());
     QVERIFY(server.serverPort() != 0);
-    connect(&server, SIGNAL(newConnection(QTcpSocket*,QString,quint16)),
-            this, SLOT(newConnectionSlot(QTcpSocket*,QString,quint16)));
+    connect(&server, &QXmppSocksServer::newConnection,
+            this, &tst_QXmppSocks::newConnectionSlot);
 
     QTcpSocket client;
     client.connectToHost(QHostAddress::LocalHost, server.serverPort());
     QVERIFY2(client.waitForConnected(), qPrintable(client.errorString()));
 
     QEventLoop loop;
-    connect(&client, SIGNAL(disconnected()), &loop, SLOT(quit()));
-    connect(&client, SIGNAL(readyRead()), &loop, SLOT(quit()));
+    connect(&client, &QAbstractSocket::disconnected, &loop, &QEventLoop::quit);
+    connect(&client, &QIODevice::readyRead, &loop, &QEventLoop::quit);
 
     // send client handshake
     client.write(clientHandshake);
diff --git a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
index 1f674c07..537b52de 100644
--- a/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
+++ b/tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp
@@ -110,8 +110,8 @@ void tst_QXmppTransferManager::testSendFile()
     sender.setLogger(&logger);
 
     QEventLoop senderLoop;
-    connect(&sender, SIGNAL(connected()), &senderLoop, SLOT(quit()));
-    connect(&sender, SIGNAL(disconnected()), &senderLoop, SLOT(quit()));
+    connect(&sender, &QXmppClient::connected, &senderLoop, &QEventLoop::quit);
+    connect(&sender, &QXmppClient::disconnected, &senderLoop, &QEventLoop::quit);
 
     QXmppConfiguration config;
     config.setDomain(testDomain);
@@ -127,14 +127,14 @@ void tst_QXmppTransferManager::testSendFile()
     QXmppClient receiver;
     auto *receiverManager = new QXmppTransferManager;
     receiverManager->setSupportedMethods(receiverMethods);
-    connect(receiverManager, SIGNAL(fileReceived(QXmppTransferJob*)),
-            this, SLOT(acceptFile(QXmppTransferJob*)));
+    connect(receiverManager, &QXmppTransferManager::fileReceived,
+            this, &tst_QXmppTransferManager::acceptFile);
     receiver.addExtension(receiverManager);
     receiver.setLogger(&logger);
 
     QEventLoop receiverLoop;
-    connect(&receiver, SIGNAL(connected()), &receiverLoop, SLOT(quit()));
-    connect(&receiver, SIGNAL(disconnected()), &receiverLoop, SLOT(quit()));
+    connect(&receiver, &QXmppClient::connected, &receiverLoop, &QEventLoop::quit);
+    connect(&receiver, &QXmppClient::disconnected, &receiverLoop, &QEventLoop::quit);
 
     config.setUser("receiver");
     config.setPassword("testpwd");
@@ -147,7 +147,7 @@ void tst_QXmppTransferManager::testSendFile()
     QXmppTransferJob *senderJob = senderManager->sendFile("receiver@localhost/QXmpp", ":/test.svg");
     QVERIFY(senderJob);
     QCOMPARE(senderJob->localFileUrl(), QUrl::fromLocalFile(":/test.svg"));
-    connect(senderJob, SIGNAL(finished()), &loop, SLOT(quit()));
+    connect(senderJob, &QXmppTransferJob::finished, &loop, &QEventLoop::quit);
     loop.exec();
 
     if (works) {
@@ -156,7 +156,7 @@ void tst_QXmppTransferManager::testSendFile()
 
         // finish receiving file
         QVERIFY(receiverJob);
-        connect(receiverJob, SIGNAL(finished()), &loop, SLOT(quit()));
+        connect(receiverJob, &QXmppTransferJob::finished, &loop, &QEventLoop::quit);
         loop.exec();
 
         QCOMPARE(receiverJob->state(), QXmppTransferJob::FinishedState);