diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2020-11-27 11:18:00 +0100 |
|---|---|---|
| committer | Andreas Buhr <andreas.buhr@qt.io> | 2020-11-30 17:16:21 +0100 |
| commit | 0440614af0bb08e373d8e3e40f90b6412c043d14 (patch) | |
| tree | 28eb691637384b1c8ea9bbbc1a9675fb0d7d977b /src/gui/math3d | |
| parent | 5e84023344bfe8987c3ce5edf57f30261d677d2c (diff) | |
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 <lars.knoll@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
Diffstat (limited to 'src/gui/math3d')
| -rw-r--r-- | src/gui/math3d/qmatrix4x4.h | 2 | ||||
| -rw-r--r-- | src/gui/math3d/qquaternion.h | 2 |
2 files changed, 2 insertions, 2 deletions
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) {} |