More qOverload cleanups in qtbase

Task-number: QTBUG-82605
Change-Id: I1c3c14ed82911ed5483258c11e76f5dd7744fa12
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>

6 files changed, 6 insertions, 11 deletions

diff --git a/examples/network/multistreamclient/client.cpp b/examples/network/multistreamclient/client.cpp
index db6e3ba304..ce84f3df9a 100644
--- a/examples/network/multistreamclient/client.cpp
+++ b/examples/network/multistreamclient/client.cpp
@@ -126,8 +126,7 @@ Client::Client(QWidget *parent)
     connect(sctpSocket, &QSctpSocket::connected, this, &Client::connected);
     connect(sctpSocket, &QSctpSocket::disconnected, this, &Client::disconnected);
     connect(sctpSocket, &QSctpSocket::channelReadyRead, this, &Client::readDatagram);
-    connect(sctpSocket, QOverload<QAbstractSocket::SocketError>::of(&QSctpSocket::error),
-            this, &Client::displayError);
+    connect(sctpSocket, &QSctpSocket::errorOccurred, this, &Client::displayError);
     connect(consumers[SctpChannels::Time], &Consumer::writeDatagram, this, &Client::writeDatagram);
     connect(consumers[SctpChannels::Chat], &Consumer::writeDatagram, this, &Client::writeDatagram);
 
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index 6784bc734d..30e4e290ea 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -868,7 +868,7 @@ void QNetworkReply::setRequest(const QNetworkRequest &request)
     Sets the error condition to be \a errorCode. The human-readable
     message is set with \a errorString.
 
-    Calling setError() does not emit the error(QNetworkReply::NetworkError)
+    Calling setError() does not emit the errorOccurred(QNetworkReply::NetworkError)
     signal.
 
     \sa error(), errorString()
diff --git a/src/network/doc/snippets/code/src_network_access_qnetworkaccessmanager.cpp b/src/network/doc/snippets/code/src_network_access_qnetworkaccessmanager.cpp
index aed74e308e..d317137dad 100644
--- a/src/network/doc/snippets/code/src_network_access_qnetworkaccessmanager.cpp
+++ b/src/network/doc/snippets/code/src_network_access_qnetworkaccessmanager.cpp
@@ -64,7 +64,7 @@ request.setRawHeader("User-Agent", "MyOwnBrowser 1.0");
 
 QNetworkReply *reply = manager->get(request);
 connect(reply, &QIODevice::readyRead, this, &MyClass::slotReadyRead);
-connect(reply, QOverload<QNetworkReply::NetworkError>::of(&QNetworkReply::error),
+connect(reply, &QNetworkReply::errorOccurred,
         this, &MyClass::slotError);
 connect(reply, &QNetworkReply::sslErrors,
         this, &MyClass::slotSslErrors);
diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp
index 6a07ae78fb..6702f25b16 100644
--- a/tests/auto/network/access/http2/tst_http2.cpp
+++ b/tests/auto/network/access/http2/tst_http2.cpp
@@ -512,9 +512,7 @@ void tst_Http2::goaway()
         request.setAttribute(QNetworkRequest::Http2AllowedAttribute, QVariant(true));
         replies[i] = manager->get(request);
         QCOMPARE(replies[i]->error(), QNetworkReply::NoError);
-        void (QNetworkReply::*errorSignal)(QNetworkReply::NetworkError) =
-            &QNetworkReply::errorOccurred;
-        connect(replies[i], errorSignal, this, &tst_Http2::replyFinishedWithError);
+        connect(replies[i], &QNetworkReply::errorOccurred, this, &tst_Http2::replyFinishedWithError);
         // Since we're using self-signed certificates, ignore SSL errors:
         replies[i]->ignoreSslErrors();
     }
diff --git a/tests/auto/network/ssl/qocsp/tst_qocsp.cpp b/tests/auto/network/ssl/qocsp/tst_qocsp.cpp
index edd1c24547..f877dcab2d 100644
--- a/tests/auto/network/ssl/qocsp/tst_qocsp.cpp
+++ b/tests/auto/network/ssl/qocsp/tst_qocsp.cpp
@@ -410,7 +410,6 @@ private:
 
     static QString certDirPath;
 
-    void (QSslSocket::*socketErrorSignal)(QAbstractSocket::SocketError) = &QAbstractSocket::errorOccurred;
     void (QSslSocket::*tlsErrorsSignal)(const QList<QSslError> &) = &QSslSocket::sslErrors;
     void (QTestEventLoop::*exitLoopSlot)() = &QTestEventLoop::exitLoop;
 
@@ -764,7 +763,7 @@ void tst_QOcsp::setupOcspClient(QSslSocket &clientSocket, const CertificateChain
     clientSocket.setSslConfiguration(clientConfig);
     clientSocket.setPeerVerifyName(name);
 
-    connect(&clientSocket, socketErrorSignal, &loop, exitLoopSlot);
+    connect(&clientSocket, &QAbstractSocket::errorOccurred, &loop, exitLoopSlot);
     connect(&clientSocket, tlsErrorsSignal, &loop, exitLoopSlot);
     connect(&clientSocket, &QSslSocket::encrypted, &loop, exitLoopSlot);
 }
diff --git a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
index 23495436eb..2d71bdfc26 100644
--- a/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
+++ b/tests/auto/network/ssl/qsslsocket/tst_qsslsocket.cpp
@@ -2552,8 +2552,7 @@ void tst_QSslSocket::closeWhileEmittingSocketError()
     clientSocket.setSslConfiguration(clientConfig);
 
     QSignalSpy socketErrorSpy(&clientSocket, SIGNAL(errorOccurred(QAbstractSocket::SocketError)));
-    void (QSslSocket::*errorSignal)(QAbstractSocket::SocketError) = &QSslSocket::errorOccurred;
-    connect(&clientSocket, errorSignal, &handshake, &BrokenPskHandshake::socketError);
+    connect(&clientSocket, &QSslSocket::errorOccurred, &handshake, &BrokenPskHandshake::socketError);
 
     clientSocket.connectToHostEncrypted(QStringLiteral("127.0.0.1"), handshake.serverPort());
     // Make sure we have some data buffered so that close will try to flush: