diff options
| author | JBB <jbb.prv@gmx.de> | 2020-01-20 00:19:38 +0100 |
|---|---|---|
| committer | LNJ <lnj@kaidan.im> | 2020-01-20 00:19:38 +0100 |
| commit | 8557bc3a605e5d2b1a7dae5999501b19c1c99b58 (patch) | |
| tree | f17fefa61a26e01c99884c7d3e458b8ea70b181b /tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp | |
| parent | cccb7675e0eb9d411c736d1ff3f189fb75ef33dd (diff) | |
| download | qxmpp-8557bc3a605e5d2b1a7dae5999501b19c1c99b58.tar.gz | |
Port majority of old-style connects (#237)
This provides more type safety and is future-proof.
Diffstat (limited to 'tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp')
| -rw-r--r-- | tests/qxmpptransfermanager/tst_qxmpptransfermanager.cpp | 16 |
1 files changed, 8 insertions, 8 deletions
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); |
