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/platforminputcontexts/ibus | |
| 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/platforminputcontexts/ibus')
| -rw-r--r-- | src/plugins/platforminputcontexts/ibus/qibustypes.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/src/plugins/platforminputcontexts/ibus/qibustypes.h b/src/plugins/platforminputcontexts/ibus/qibustypes.h index e6bff1ef81..ef2dcc341a 100644 --- a/src/plugins/platforminputcontexts/ibus/qibustypes.h +++ b/src/plugins/platforminputcontexts/ibus/qibustypes.h @@ -92,7 +92,7 @@ public: quint32 start; quint32 end; }; -Q_DECLARE_TYPEINFO(QIBusAttribute, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QIBusAttribute, Q_RELOCATABLE_TYPE); class QIBusAttributeList : private QIBusSerializable { @@ -106,7 +106,7 @@ public: QList<QIBusAttribute> attributes; }; -Q_DECLARE_TYPEINFO(QIBusAttributeList, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QIBusAttributeList, Q_RELOCATABLE_TYPE); class QIBusText : private QIBusSerializable { @@ -119,7 +119,7 @@ public: QString text; QIBusAttributeList attributes; }; -Q_DECLARE_TYPEINFO(QIBusText, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QIBusText, Q_RELOCATABLE_TYPE); class QIBusEngineDesc : private QIBusSerializable { @@ -147,7 +147,7 @@ public: QString textdomain; QString iconpropkey; }; -Q_DECLARE_TYPEINFO(QIBusEngineDesc, Q_MOVABLE_TYPE); +Q_DECLARE_TYPEINFO(QIBusEngineDesc, Q_RELOCATABLE_TYPE); inline QDBusArgument &operator<<(QDBusArgument &argument, const QIBusAttribute &attribute) { attribute.serializeTo(argument); return argument; } |