diff options
author | João Barbosa <joao.paulo.barbosa@gmail.com> | 2018-06-24 16:18:22 +0100 |
---|---|---|
committer | João Barbosa <joao.paulo.barbosa@gmail.com> | 2018-08-21 09:43:54 +0100 |
commit | f78558f1e39198779bdb17e2b0e256fb99ad4b28 (patch) | |
tree | e70cf07bb8f64df2f4b65a4999b8bafa435d9d51 /src/qt/test | |
parent | 8aa9badf5ea3ea98980f50d924e88e46c4d5ee38 (diff) | |
download | bitcoin-f78558f1e39198779bdb17e2b0e256fb99ad4b28.tar.xz |
qt: Use new Qt5 connect syntax
Diffstat (limited to 'src/qt/test')
-rw-r--r-- | src/qt/test/paymentservertests.cpp | 8 | ||||
-rw-r--r-- | src/qt/test/util.cpp | 2 | ||||
-rw-r--r-- | src/qt/test/wallettests.cpp | 2 |
3 files changed, 6 insertions, 6 deletions
diff --git a/src/qt/test/paymentservertests.cpp b/src/qt/test/paymentservertests.cpp index e92f9d7a5b..5384b9e8b0 100644 --- a/src/qt/test/paymentservertests.cpp +++ b/src/qt/test/paymentservertests.cpp @@ -39,8 +39,8 @@ X509 *parse_b64der_cert(const char* cert_data) static SendCoinsRecipient handleRequest(PaymentServer* server, std::vector<unsigned char>& data) { RecipientCatcher sigCatcher; - QObject::connect(server, SIGNAL(receivedPaymentRequest(SendCoinsRecipient)), - &sigCatcher, SLOT(getRecipient(SendCoinsRecipient))); + QObject::connect(server, &PaymentServer::receivedPaymentRequest, + &sigCatcher, &RecipientCatcher::getRecipient); // Write data to a temp file: QTemporaryFile f; @@ -57,8 +57,8 @@ static SendCoinsRecipient handleRequest(PaymentServer* server, std::vector<unsig // which will lead to a test failure anyway. QCoreApplication::sendEvent(&object, &event); - QObject::disconnect(server, SIGNAL(receivedPaymentRequest(SendCoinsRecipient)), - &sigCatcher, SLOT(getRecipient(SendCoinsRecipient))); + QObject::disconnect(server, &PaymentServer::receivedPaymentRequest, + &sigCatcher, &RecipientCatcher::getRecipient); // Return results from sigCatcher return sigCatcher.recipient; diff --git a/src/qt/test/util.cpp b/src/qt/test/util.cpp index 261caaaee5..0bd719326e 100644 --- a/src/qt/test/util.cpp +++ b/src/qt/test/util.cpp @@ -18,5 +18,5 @@ void ConfirmMessage(QString* text, int msec) } } delete callback; - }), SLOT(call())); + }), &Callback::call); } diff --git a/src/qt/test/wallettests.cpp b/src/qt/test/wallettests.cpp index c314dadde4..a0cfe8ae87 100644 --- a/src/qt/test/wallettests.cpp +++ b/src/qt/test/wallettests.cpp @@ -50,7 +50,7 @@ void ConfirmSend(QString* text = nullptr, bool cancel = false) } } delete callback; - }), SLOT(call())); + }), &Callback::call); } //! Send coins to address and return txid. |