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/plugins/generic/tuiotouch | |
| 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/plugins/generic/tuiotouch')
| -rw-r--r-- | src/plugins/generic/tuiotouch/qoscbundle_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/generic/tuiotouch/qoscmessage_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/generic/tuiotouch/qtuiocursor_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/generic/tuiotouch/qtuiotoken_p.h | 2 |
4 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/generic/tuiotouch/qoscbundle_p.h b/src/plugins/generic/tuiotouch/qoscbundle_p.h index 5aee310017..66f93f4964 100644 --- a/src/plugins/generic/tuiotouch/qoscbundle_p.h +++ b/src/plugins/generic/tuiotouch/qoscbundle_p.h @@ -68,7 +68,7 @@ private: QList<QOscBundle> m_bundles; QList<QOscMessage> m_messages; }; -Q_DECLARE_TYPEINFO(QOscBundle, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QOscBundle, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/plugins/generic/tuiotouch/qoscmessage_p.h b/src/plugins/generic/tuiotouch/qoscmessage_p.h index f8738c4242..97660c4b5e 100644 --- a/src/plugins/generic/tuiotouch/qoscmessage_p.h +++ b/src/plugins/generic/tuiotouch/qoscmessage_p.h @@ -65,7 +65,7 @@ private: QByteArray m_addressPattern; QVariantList m_arguments; }; -Q_DECLARE_TYPEINFO(QOscMessage, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QOscMessage, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE diff --git a/src/plugins/generic/tuiotouch/qtuiocursor_p.h b/src/plugins/generic/tuiotouch/qtuiocursor_p.h index b8301bcf2c..504e514d14 100644 --- a/src/plugins/generic/tuiotouch/qtuiocursor_p.h +++ b/src/plugins/generic/tuiotouch/qtuiocursor_p.h @@ -102,7 +102,7 @@ private: float m_acceleration; QEventPoint::State m_state; }; -Q_DECLARE_TYPEINFO(QTuioCursor, Q_MOVABLE_TYPE); // Q_PRIMITIVE_TYPE: not possible, m_state is = 1, not 0. +Q_DECLARE_TYPEINFO(QTuioCursor, Q_RELOCATABLE_TYPE); // Q_PRIMITIVE_TYPE: not possible, m_state is = 1, not 0. QT_END_NAMESPACE diff --git a/src/plugins/generic/tuiotouch/qtuiotoken_p.h b/src/plugins/generic/tuiotouch/qtuiotoken_p.h index 0c72436c4c..f449748a58 100644 --- a/src/plugins/generic/tuiotouch/qtuiotoken_p.h +++ b/src/plugins/generic/tuiotouch/qtuiotoken_p.h @@ -138,7 +138,7 @@ private: float m_angularAcceleration; QEventPoint::State m_state; }; -Q_DECLARE_TYPEINFO(QTuioToken, Q_MOVABLE_TYPE); // Q_PRIMITIVE_TYPE: not possible: m_id, m_classId == -1 +Q_DECLARE_TYPEINFO(QTuioToken, Q_RELOCATABLE_TYPE); // Q_PRIMITIVE_TYPE: not possible: m_id, m_classId == -1 QT_END_NAMESPACE |