Port majority of old-style connects (#237)

This provides more type safety and is future-proof.

1 files changed, 12 insertions, 12 deletions

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();