QNetworkReply: rename socketConnecting to socketStartedConnecting

From the API review.

Pick-to: 6.3
Change-Id: Ic05737db79327e7811fcd974a70914b837e06601
Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io>
Reviewed-by: Qt CI Bot <qt_ci_bot@qt-project.org>

9 files changed, 13 insertions, 13 deletions

diff --git a/src/network/access/qhttpnetworkconnectionchannel.cpp b/src/network/access/qhttpnetworkconnectionchannel.cpp
index c8bea484a9..17c0acca57 100644
--- a/src/network/access/qhttpnetworkconnectionchannel.cpp
+++ b/src/network/access/qhttpnetworkconnectionchannel.cpp
@@ -358,9 +358,9 @@ bool QHttpNetworkConnectionChannel::ensureConnection()
 
         QHttpNetworkReply *potentialReply = connection->d_func()->predictNextRequestsReply();
         if (potentialReply) {
-            QMetaObject::invokeMethod(potentialReply, "socketConnecting", Qt::QueuedConnection);
+            QMetaObject::invokeMethod(potentialReply, "socketStartedConnecting", Qt::QueuedConnection);
         } else if (h2RequestsToSend.count() > 0) {
-            QMetaObject::invokeMethod(h2RequestsToSend.values().at(0).second, "socketConnecting", Qt::QueuedConnection);
+            QMetaObject::invokeMethod(h2RequestsToSend.values().at(0).second, "socketStartedConnecting", Qt::QueuedConnection);
         }
 
 #ifndef QT_NO_NETWORKPROXY
diff --git a/src/network/access/qhttpnetworkreply_p.h b/src/network/access/qhttpnetworkreply_p.h
index 39e8b24303..ada57afe5a 100644
--- a/src/network/access/qhttpnetworkreply_p.h
+++ b/src/network/access/qhttpnetworkreply_p.h
@@ -174,7 +174,7 @@ Q_SIGNALS:
 #endif
 
 Q_SIGNALS:
-    void socketConnecting();
+    void socketStartedConnecting();
     void requestSent();
     void readyRead();
     void finished();
diff --git a/src/network/access/qhttpthreaddelegate.cpp b/src/network/access/qhttpthreaddelegate.cpp
index 2885e567e6..9774e5b43e 100644
--- a/src/network/access/qhttpthreaddelegate.cpp
+++ b/src/network/access/qhttpthreaddelegate.cpp
@@ -384,7 +384,7 @@ void QHttpThreadDelegate::startRequest()
 
         // Don't care about ignored SSL errors for now in the synchronous HTTP case.
     } else if (!synchronous) {
-        connect(httpReply,SIGNAL(socketConnecting()), this, SIGNAL(socketConnecting()));
+        connect(httpReply,SIGNAL(socketStartedConnecting()), this, SIGNAL(socketStartedConnecting()));
         connect(httpReply,SIGNAL(requestSent()), this, SIGNAL(requestSent()));
         connect(httpReply,SIGNAL(headerChanged()), this, SLOT(headerChangedSlot()));
         connect(httpReply,SIGNAL(finished()), this, SLOT(finishedSlot()));
diff --git a/src/network/access/qhttpthreaddelegate_p.h b/src/network/access/qhttpthreaddelegate_p.h
index bdafeb3693..49f87e8ce3 100644
--- a/src/network/access/qhttpthreaddelegate_p.h
+++ b/src/network/access/qhttpthreaddelegate_p.h
@@ -144,7 +144,7 @@ signals:
     void sslConfigurationChanged(const QSslConfiguration &);
     void preSharedKeyAuthenticationRequired(QSslPreSharedKeyAuthenticator *);
 #endif
-    void socketConnecting();
+    void socketStartedConnecting();
     void requestSent();
     void downloadMetaData(const QList<QPair<QByteArray,QByteArray> > &, int, const QString &, bool,
                           QSharedPointer<char>, qint64, qint64, bool, bool);
diff --git a/src/network/access/qnetworkreply.cpp b/src/network/access/qnetworkreply.cpp
index c7d81f2f8f..05230b1e26 100644
--- a/src/network/access/qnetworkreply.cpp
+++ b/src/network/access/qnetworkreply.cpp
@@ -322,7 +322,7 @@ QNetworkReplyPrivate::QNetworkReplyPrivate()
 */
 
 /*!
-    \fn void QNetworkReply::socketConnecting()
+    \fn void QNetworkReply::socketStartedConnecting()
     \since 6.3
 
     This signal is emitted 0 or more times, when the socket
@@ -339,7 +339,7 @@ QNetworkReplyPrivate::QNetworkReplyPrivate()
     This signal is emitted 1 or more times when the request was
     sent. Useful for custom progress or timeout handling.
 
-    \sa metaDataChanged(), socketConnecting()
+    \sa metaDataChanged(), socketStartedConnecting()
 */
 
 /*!
diff --git a/src/network/access/qnetworkreply.h b/src/network/access/qnetworkreply.h
index 0cd01f6d4b..3bd034dd8d 100644
--- a/src/network/access/qnetworkreply.h
+++ b/src/network/access/qnetworkreply.h
@@ -154,7 +154,7 @@ public Q_SLOTS:
     virtual void ignoreSslErrors();
 
 Q_SIGNALS:
-    void socketConnecting();
+    void socketStartedConnecting();
     void requestSent();
     void metaDataChanged();
     void finished();
diff --git a/src/network/access/qnetworkreplyhttpimpl.cpp b/src/network/access/qnetworkreplyhttpimpl.cpp
index 3dc8e0a67b..157b86b52e 100644
--- a/src/network/access/qnetworkreplyhttpimpl.cpp
+++ b/src/network/access/qnetworkreplyhttpimpl.cpp
@@ -878,8 +878,8 @@ void QNetworkReplyHttpImplPrivate::postRequest(const QNetworkRequest &newHttpReq
         QObject::connect(delegate, SIGNAL(downloadFinished()),
                 q, SLOT(replyFinished()),
                 Qt::QueuedConnection);
-        QObject::connect(delegate, &QHttpThreadDelegate::socketConnecting,
-                q, &QNetworkReply::socketConnecting, Qt::QueuedConnection);
+        QObject::connect(delegate, &QHttpThreadDelegate::socketStartedConnecting,
+                q, &QNetworkReply::socketStartedConnecting, Qt::QueuedConnection);
         QObject::connect(delegate, &QHttpThreadDelegate::requestSent,
                 q, &QNetworkReply::requestSent, Qt::QueuedConnection);
         connect(delegate, &QHttpThreadDelegate::downloadMetaData, this,
diff --git a/tests/auto/network/access/http2/tst_http2.cpp b/tests/auto/network/access/http2/tst_http2.cpp
index 34b7e8fa37..515d026a61 100644
--- a/tests/auto/network/access/http2/tst_http2.cpp
+++ b/tests/auto/network/access/http2/tst_http2.cpp
@@ -933,7 +933,7 @@ void tst_Http2::moreActivitySignals()
     QSharedPointer<QNetworkReply> reply(manager->get(request));
     nRequests = 1;
     connect(reply.data(), &QNetworkReply::finished, this, &tst_Http2::replyFinished);
-    QSignalSpy spy1(reply.data(), SIGNAL(socketConnecting()));
+    QSignalSpy spy1(reply.data(), SIGNAL(socketStartedConnecting()));
     QSignalSpy spy2(reply.data(), SIGNAL(requestSent()));
     QSignalSpy spy3(reply.data(), SIGNAL(metaDataChanged()));
     // Since we're using self-signed certificates,
diff --git a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
index 2ebeff8689..649ec82f51 100644
--- a/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
+++ b/tests/auto/network/access/qnetworkreply/tst_qnetworkreply.cpp
@@ -9561,7 +9561,7 @@ void tst_QNetworkReply::moreActivitySignals()
     url.setPort(server.serverPort());
     QNetworkRequest request(url);
     QNetworkReplyPtr reply(manager.get(request));
-    QSignalSpy spy1(reply.data(), SIGNAL(socketConnecting()));
+    QSignalSpy spy1(reply.data(), SIGNAL(socketStartedConnecting()));
     QSignalSpy spy2(reply.data(), SIGNAL(requestSent()));
     QSignalSpy spy3(reply.data(), SIGNAL(metaDataChanged()));
     QSignalSpy spy4(reply.data(), SIGNAL(finished()));
@@ -9574,7 +9574,7 @@ void tst_QNetworkReply::moreActivitySignals()
     spy4.wait();
     QCOMPARE(spy4.count(), 1);
     QVERIFY(reply->error() == QNetworkReply::NoError);
-    // Second request will not send socketConnecting because of keep-alive, so don't check it.
+    // Second request will not send socketStartedConnecting because of keep-alive, so don't check it.
     QNetworkReplyPtr secondreply(manager.get(request));
     QSignalSpy secondspy2(secondreply.data(), SIGNAL(requestSent()));
     QSignalSpy secondspy3(secondreply.data(), SIGNAL(metaDataChanged()));