diff options
author | Mate Barany <[email protected]> | 2024-06-05 14:17:04 +0200 |
---|---|---|
committer | Mate Barany <[email protected]> | 2024-06-10 10:41:01 +0200 |
commit | f0a8fe6cdf3ec5e8c9030fa581df1aad3b78d210 (patch) | |
tree | d5ee5ec61c6cf93b2ecc109d48ba1f93001919cf | |
parent | d4c4e6b876b948c1a34abdd46cf7f5be1c302137 (diff) |
Make the new post and put methods inline in QNetworkAccessManager
Found in API review.
Pick-to: 6.8
Change-Id: I873c8c0b7e9521d07718b7fd38065d33b98e3ba9
Reviewed-by: Marc Mutz <[email protected]>
Reviewed-by: MÃ¥rten Nordheim <[email protected]>
-rw-r--r-- | src/network/access/qnetworkaccessmanager.cpp | 25 | ||||
-rw-r--r-- | 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); |