From 0440614af0bb08e373d8e3e40f90b6412c043d14 Mon Sep 17 00:00:00 2001 From: Andreas Buhr Date: Fri, 27 Nov 2020 11:18:00 +0100 Subject: Replace discouraged Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPE Q_MOVABLE_TYPE was conceived before C++ had move semantics. Now, with move semantics, its name is misleading. Q_RELOCATABLE_TYPE was introduced as a synonym to Q_MOVABLE_TYPE. Usage of Q_MOVABLE_TYPE is discouraged now. This patch replaces all usages of Q_MOVABLE_TYPE by Q_RELOCATABLE_TYPE in QtBase. As the two are synonymous, this patch should have no impact on users. Pick-to: 6.0 Change-Id: Ie653984363198c1aeb1f70f8e0fa189aae38eb5c Reviewed-by: Lars Knoll Reviewed-by: Andrei Golubev --- src/gui/math3d/qmatrix4x4.h | 2 +- src/gui/math3d/qquaternion.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'src/gui/math3d') diff --git a/src/gui/math3d/qmatrix4x4.h b/src/gui/math3d/qmatrix4x4.h index 2a448f0baf..402f27fcb5 100644 --- a/src/gui/math3d/qmatrix4x4.h +++ b/src/gui/math3d/qmatrix4x4.h @@ -213,7 +213,7 @@ Q_DECLARE_OPERATORS_FOR_FLAGS(QMatrix4x4::Flags) QT_WARNING_PUSH QT_WARNING_DISABLE_FLOAT_COMPARE -Q_DECLARE_TYPEINFO(QMatrix4x4, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QMatrix4x4, Q_RELOCATABLE_TYPE); inline QMatrix4x4::QMatrix4x4 (float m11, float m12, float m13, float m14, diff --git a/src/gui/math3d/qquaternion.h b/src/gui/math3d/qquaternion.h index 99ee9085f9..76fa237afd 100644 --- a/src/gui/math3d/qquaternion.h +++ b/src/gui/math3d/qquaternion.h @@ -169,7 +169,7 @@ private: float wp, xp, yp, zp; }; -Q_DECLARE_TYPEINFO(QQuaternion, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QQuaternion, Q_RELOCATABLE_TYPE); inline QQuaternion::QQuaternion() : wp(1.0f), xp(0.0f), yp(0.0f), zp(0.0f) {} -- cgit v1.2.3