diff options
Diffstat (limited to 'src/gui/kernel')
-rw-r--r-- | src/gui/kernel/qcursor.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qeventpoint.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qkeysequence.h | 2 | ||||
-rw-r--r-- | src/gui/kernel/qpalette.h | 4 |
4 files changed, 5 insertions, 5 deletions
diff --git a/src/gui/kernel/qcursor.h b/src/gui/kernel/qcursor.h index c1d45cc41b..0bc54a3d82 100644 --- a/src/gui/kernel/qcursor.h +++ b/src/gui/kernel/qcursor.h @@ -90,7 +90,7 @@ public: QCursor(QCursor &&other) noexcept : d(qExchange(other.d, nullptr)) {} QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_MOVE_AND_SWAP(QCursor) - void swap(QCursor &other) noexcept { qSwap(d, other.d); } + void swap(QCursor &other) noexcept { qt_ptr_swap(d, other.d); } operator QVariant() const; diff --git a/src/gui/kernel/qeventpoint.h b/src/gui/kernel/qeventpoint.h index fbcdc20193..1e4eca040d 100644 --- a/src/gui/kernel/qeventpoint.h +++ b/src/gui/kernel/qeventpoint.h @@ -102,7 +102,7 @@ public: bool operator!=(const QEventPoint &other) const noexcept { return !operator==(other); } ~QEventPoint(); inline void swap(QEventPoint &other) noexcept - { qSwap(d, other.d); } + { d.swap(other.d); } QPointF position() const; QPointF pressPosition() const; diff --git a/src/gui/kernel/qkeysequence.h b/src/gui/kernel/qkeysequence.h index 61001dddbc..f614046748 100644 --- a/src/gui/kernel/qkeysequence.h +++ b/src/gui/kernel/qkeysequence.h @@ -186,7 +186,7 @@ public: QKeyCombination operator[](uint i) const; QKeySequence &operator=(const QKeySequence &other); QT_MOVE_ASSIGNMENT_OPERATOR_IMPL_VIA_PURE_SWAP(QKeySequence) - void swap(QKeySequence &other) noexcept { qSwap(d, other.d); } + void swap(QKeySequence &other) noexcept { qt_ptr_swap(d, other.d); } bool operator==(const QKeySequence &other) const; inline bool operator!= (const QKeySequence &other) const diff --git a/src/gui/kernel/qpalette.h b/src/gui/kernel/qpalette.h index 776d489d44..8525ae8af4 100644 --- a/src/gui/kernel/qpalette.h +++ b/src/gui/kernel/qpalette.h @@ -74,8 +74,8 @@ public: void swap(QPalette &other) noexcept { - qSwap(currentGroup, other.currentGroup); - qSwap(d, other.d); + std::swap(currentGroup, other.currentGroup); + qt_ptr_swap(d, other.d); } operator QVariant() const; |