From a0dfa8c4d29a005009d04dcb52452efb9d74e26e Mon Sep 17 00:00:00 2001 From: Fabian Kosmale Date: Mon, 26 Sep 2022 17:38:14 +0200 Subject: Replace qExchange calls with std::exchange qExchange is one of the few remaining functionalities that have not been moved out of qglobal. Given that std::exchange exists in the standard, we can simply move to it everywhere... ...if it weren't for the fact that std::exchange is only constexpr in C++20, and only has its noexceptness specified in (most likely) C++23. Still, we want to move to the existing std functionality where possible, to allow the removal of qglobal includes in lieu of something more fine-grained in the future. So leave any constexpr calls[1] alone for now (and observe that none of our current usages cares about the conditional noexceptness), but replace everything else. [1] QScopedValueRollback' ctor and QExplicitlySharedDataPointerV2::take Task-number: QTBUG-99313 Change-Id: I599cb9846cf319c7ffd3457130938347a75aad25 Reviewed-by: Thiago Macieira --- src/network/access/qhttpprotocolhandler.cpp | 6 +++--- src/network/access/qnetworkreplyimpl.cpp | 2 +- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'src/network/access') diff --git a/src/network/access/qhttpprotocolhandler.cpp b/src/network/access/qhttpprotocolhandler.cpp index 36102909df..b2576a85e6 100644 --- a/src/network/access/qhttpprotocolhandler.cpp +++ b/src/network/access/qhttpprotocolhandler.cpp @@ -298,7 +298,7 @@ bool QHttpProtocolHandler::sendRequest() sendRequest(); //recurse } else { // no data to send: just send the HTTP headers - m_socket->write(qExchange(m_header, {})); + m_socket->write(std::exchange(m_header, {})); QMetaObject::invokeMethod(m_reply, "requestSent", Qt::QueuedConnection); m_channel->state = QHttpNetworkConnectionChannel::WaitingState; // now wait for response sendRequest(); //recurse @@ -314,7 +314,7 @@ bool QHttpProtocolHandler::sendRequest() // the upload device might have no data to send, but we still have to send the headers, // do it now. if (!m_header.isEmpty()) - m_socket->write(qExchange(m_header, {})); + m_socket->write(std::exchange(m_header, {})); if (uploadByteDevice) emit m_reply->dataSendProgress(m_channel->written, m_channel->bytesTotal); m_channel->state = QHttpNetworkConnectionChannel::WaitingState; // now wait for response @@ -371,7 +371,7 @@ bool QHttpProtocolHandler::sendRequest() // assemble header and data and send them together const qint64 headerSize = m_header.size(); m_header.append(readPointer, currentReadSize); - currentWriteSize = m_socket->write(qExchange(m_header, {})); + currentWriteSize = m_socket->write(std::exchange(m_header, {})); if (currentWriteSize != -1) currentWriteSize -= headerSize; QMetaObject::invokeMethod(m_reply, "requestSent", Qt::QueuedConnection); diff --git a/src/network/access/qnetworkreplyimpl.cpp b/src/network/access/qnetworkreplyimpl.cpp index a1fedb4cd3..2c713e69fd 100644 --- a/src/network/access/qnetworkreplyimpl.cpp +++ b/src/network/access/qnetworkreplyimpl.cpp @@ -281,7 +281,7 @@ void QNetworkReplyImplPrivate::handleNotifications() if (notificationHandlingPaused) return; - for (InternalNotifications notification : qExchange(pendingNotifications, {})) { + for (InternalNotifications notification : std::exchange(pendingNotifications, {})) { if (state != Working) return; switch (notification) { -- cgit v1.2.3