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/kernel/qhostinfo.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'src/network/kernel') diff --git a/src/network/kernel/qhostinfo.h b/src/network/kernel/qhostinfo.h index 6ee8aff081..eac23ac296 100644 --- a/src/network/kernel/qhostinfo.h +++ b/src/network/kernel/qhostinfo.h @@ -26,7 +26,7 @@ public: explicit QHostInfo(int lookupId = -1); QHostInfo(const QHostInfo &d); - QHostInfo(QHostInfo &&other) noexcept : d_ptr(qExchange(other.d_ptr, nullptr)) {} + QHostInfo(QHostInfo &&other) noexcept : d_ptr(std::exchange(other.d_ptr, nullptr)) {} QHostInfo &operator=(const QHostInfo &d); QHostInfo &operator=(QHostInfo &&other) noexcept { swap(other); return *this; } ~QHostInfo(); -- cgit v1.2.3