From 7953546072aca6ce394d9c323a16810012d9f97c Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Thu, 12 Sep 2024 16:33:30 +0200 Subject: [PATCH] QBindingObserverPtr: fix redundant ; MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Found by applying headercheck to private headers, not just public ones. Amends f1b1773d0ae636fa9afa36224ba17566484af3cc. Pick-to: 6.7 6.5 6.2 Task-number: QTBUG-126219 Change-Id: I3998cd5875f989152c6bd6b24b04e61627959cc2 Reviewed-by: Øystein Heskestad Reviewed-by: Alexey Edelev (cherry picked from commit 1d163e916c8da49f9f617ca1545b5f6ac9d6a0b9) Reviewed-by: Qt Cherry-pick Bot --- src/corelib/kernel/qproperty_p.h | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/corelib/kernel/qproperty_p.h b/src/corelib/kernel/qproperty_p.h index 376482a6afe..53e76412515 100644 --- a/src/corelib/kernel/qproperty_p.h +++ b/src/corelib/kernel/qproperty_p.h @@ -46,11 +46,11 @@ private: QPropertyObserver *d = nullptr; public: QBindingObserverPtr() = default; - Q_DISABLE_COPY(QBindingObserverPtr); + Q_DISABLE_COPY(QBindingObserverPtr) void swap(QBindingObserverPtr &other) noexcept { qt_ptr_swap(d, other.d); } QBindingObserverPtr(QBindingObserverPtr &&other) noexcept : d(std::exchange(other.d, nullptr)) {} - QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QBindingObserverPtr); + QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QBindingObserverPtr) inline QBindingObserverPtr(QPropertyObserver *observer) noexcept;