From 6c2b076650eede8ffc52a825c36c9b790ce25731 Mon Sep 17 00:00:00 2001
From: Mate Barany <mate.barany@qt.io>
Date: Wed, 5 Jun 2024 14:17:04 +0200
Subject: [PATCH] Make the new post and put methods inline in
 QNetworkAccessManager
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Found in API review.

Change-Id: I873c8c0b7e9521d07718b7fd38065d33b98e3ba9
Reviewed-by: Marc Mutz <marc.mutz@qt.io>
Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io>
(cherry picked from commit f0a8fe6cdf3ec5e8c9030fa581df1aad3b78d210)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
---
 src/network/access/qnetworkaccessmanager.cpp | 25 +++++---------------
 src/network/access/qnetworkaccessmanager.h   | 12 ++++++++--
 2 files changed, 16 insertions(+), 21 deletions(-)

diff --git a/src/network/access/qnetworkaccessmanager.cpp b/src/network/access/qnetworkaccessmanager.cpp
index ae99721758a..b371730c3c2 100644
--- a/src/network/access/qnetworkaccessmanager.cpp
+++ b/src/network/access/qnetworkaccessmanager.cpp
@@ -857,22 +857,15 @@ QNetworkReply *QNetworkAccessManager::post(const QNetworkRequest &request, const
 }
 
 /*!
-    \overload
+    \fn QNetworkReply *QNetworkAccessManager::post(const QNetworkRequest &request, std::nullptr_t nptr)
 
     \since 6.8
 
+    \overload
+
     Sends the POST request specified by \a request without a body and returns
     a new QNetworkReply object.
 */
-QNetworkReply *QNetworkAccessManager::post(const QNetworkRequest &request, std::nullptr_t nptr)
-{
-    Q_UNUSED(nptr);
-    QIODevice *dev = nullptr;
-
-    return d_func()->postProcess(createRequest(QNetworkAccessManager::PostOperation,
-                                               request,
-                                               dev));
-}
 
 #if QT_CONFIG(http) || defined(Q_OS_WASM)
 /*!
@@ -958,22 +951,16 @@ QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, const
 }
 
 /*!
+    \since 6.8
+
     \overload
 
-    \since 6.8
+    \fn QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, std::nullptr_t nptr)
 
     Sends the PUT request specified by \a request without a body and returns
     a new QNetworkReply object.
 */
 
-QNetworkReply *QNetworkAccessManager::put(const QNetworkRequest &request, std::nullptr_t nptr)
-{
-    Q_UNUSED(nptr);
-    QIODevice *dev = nullptr;
-
-    return d_func()->postProcess(createRequest(QNetworkAccessManager::PutOperation, request, dev));
-}
-
 /*!
     \since 4.6
 
diff --git a/src/network/access/qnetworkaccessmanager.h b/src/network/access/qnetworkaccessmanager.h
index 0d069b2a9b0..4bae05772ff 100644
--- a/src/network/access/qnetworkaccessmanager.h
+++ b/src/network/access/qnetworkaccessmanager.h
@@ -84,10 +84,18 @@ public:
     QNetworkReply *get(const QNetworkRequest &request, const QByteArray &data);
     QNetworkReply *post(const QNetworkRequest &request, QIODevice *data);
     QNetworkReply *post(const QNetworkRequest &request, const QByteArray &data);
-    QNetworkReply *post(const QNetworkRequest &request, std::nullptr_t nptr);
+    QNetworkReply *post(const QNetworkRequest &request, std::nullptr_t)
+    {
+        return post(request, static_cast<QIODevice*>(nullptr));
+    }
+
     QNetworkReply *put(const QNetworkRequest &request, QIODevice *data);
     QNetworkReply *put(const QNetworkRequest &request, const QByteArray &data);
-    QNetworkReply *put(const QNetworkRequest &request, std::nullptr_t nptr);
+    QNetworkReply *put(const QNetworkRequest &request, std::nullptr_t)
+    {
+        return put(request, static_cast<QIODevice*>(nullptr));
+    }
+
     QNetworkReply *deleteResource(const QNetworkRequest &request);
     QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, QIODevice *data = nullptr);
     QNetworkReply *sendCustomRequest(const QNetworkRequest &request, const QByteArray &verb, const QByteArray &data);