diff options
| author | Andreas Buhr <andreas.buhr@qt.io> | 2020-11-27 11:18:00 +0100 |
|---|---|---|
| committer | Qt Cherry-pick Bot <cherrypick_bot@qt-project.org> | 2020-12-04 05:12:56 +0000 |
| commit | f3d1d963c7c6bc5f9958c857b3d8baeab61c82c5 (patch) | |
| tree | 5e003cc94e50a88d31561adc4032d0ab2c95da67 /src/corelib/kernel/qmetaobject.h | |
| parent | 54c9588ce2150d7c43dbf6089e9729ea79b71731 (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.
Change-Id: Ie653984363198c1aeb1f70f8e0fa189aae38eb5c
Reviewed-by: Lars Knoll <lars.knoll@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
(cherry picked from commit 0440614af0bb08e373d8e3e40f90b6412c043d14)
Reviewed-by: Qt Cherry-pick Bot <cherrypick_bot@qt-project.org>
Diffstat (limited to 'src/corelib/kernel/qmetaobject.h')
| -rw-r--r-- | src/corelib/kernel/qmetaobject.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/corelib/kernel/qmetaobject.h b/src/corelib/kernel/qmetaobject.h index 2cc334aff3..dd4619dc03 100644 --- a/src/corelib/kernel/qmetaobject.h +++ b/src/corelib/kernel/qmetaobject.h @@ -213,7 +213,7 @@ private: friend bool operator!=(const QMetaMethod &m1, const QMetaMethod &m2) noexcept { return !(m1 == m2); } }; -Q_DECLARE_TYPEINFO(QMetaMethod, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QMetaMethod, Q_RELOCATABLE_TYPE); class Q_CORE_EXPORT QMetaEnum { @@ -270,7 +270,7 @@ private: friend struct QMetaObject; friend struct QMetaObjectPrivate; }; -Q_DECLARE_TYPEINFO(QMetaEnum, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QMetaEnum, Q_RELOCATABLE_TYPE); class Q_CORE_EXPORT QMetaProperty { @@ -378,7 +378,7 @@ private: Data data; friend struct QMetaObject; }; -Q_DECLARE_TYPEINFO(QMetaClassInfo, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QMetaClassInfo, Q_RELOCATABLE_TYPE); QT_END_NAMESPACE |