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 <thiago.macieira@intel.com>

2 files changed, 2 insertions, 2 deletions

diff --git a/src/gui/image/qicon.h b/src/gui/image/qicon.h
index 63816220dd..22f63b1ecb 100644
--- a/src/gui/image/qicon.h
+++ b/src/gui/image/qicon.h
@@ -26,7 +26,7 @@ public:
     QIcon(const QPixmap &pixmap);
     QIcon(const QIcon &other);
     QIcon(QIcon &&other) noexcept
-        : d(qExchange(other.d, nullptr))
+        : d(std::exchange(other.d, nullptr))
     {}
     explicit QIcon(const QString &fileName); // file or resource name
     explicit QIcon(QIconEngine *engine);
diff --git a/src/gui/image/qimage.h b/src/gui/image/qimage.h
index aa58af4a76..86c49ac28a 100644
--- a/src/gui/image/qimage.h
+++ b/src/gui/image/qimage.h
@@ -96,7 +96,7 @@ public:
 
     QImage(const QImage &);
     QImage(QImage &&other) noexcept
-        : QPaintDevice(), d(qExchange(other.d, nullptr))
+        : QPaintDevice(), d(std::exchange(other.d, nullptr))
     {}
     ~QImage();