From 26b8e99b1ce616a063fcbd0d67f44ba9e7712f23 Mon Sep 17 00:00:00 2001 From: Ivan Solovev Date: Wed, 17 Jan 2024 16:16:55 +0100 Subject: [PATCH] QEventLoopLocker: use macro to implement move-ctor We do have special macros for this case, so use one of them! Amends c2956f8f7685b624d7693ff644125d0f594c585d Found in 6.7 API review. Pick-to: 6.7 Change-Id: I205966d6f7363abf1a26f59b04555b1a48a4e696 Reviewed-by: Marc Mutz --- src/corelib/kernel/qeventloop.h | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/src/corelib/kernel/qeventloop.h b/src/corelib/kernel/qeventloop.h index 68d4023361..ec79c07cd7 100644 --- a/src/corelib/kernel/qeventloop.h +++ b/src/corelib/kernel/qeventloop.h @@ -65,8 +65,7 @@ public: Q_NODISCARD_CTOR QEventLoopLocker(QEventLoopLocker &&other) noexcept : p{std::exchange(other.p, 0)} {} - QEventLoopLocker &operator=(QEventLoopLocker &&other) noexcept - { auto moved = std::move(other); swap(moved); return *this; } + QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QEventLoopLocker) void swap(QEventLoopLocker &other) noexcept { std::swap(p, other.p); } friend void swap(QEventLoopLocker &lhs, QEventLoopLocker &rhs) noexcept { lhs.swap(rhs); }