From 0440614af0bb08e373d8e3e40f90b6412c043d14 Mon Sep 17 00:00:00 2001
From: Andreas Buhr <andreas.buhr@qt.io>
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 <lars.knoll@qt.io>
Reviewed-by: Andrei Golubev <andrei.golubev@qt.io>
---
 src/gui/accessible/linux/qspi_struct_marshallers_p.h | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

(limited to 'src/gui/accessible')

diff --git a/src/gui/accessible/linux/qspi_struct_marshallers_p.h b/src/gui/accessible/linux/qspi_struct_marshallers_p.h
index 9850058efc..c7a4a97176 100644
--- a/src/gui/accessible/linux/qspi_struct_marshallers_p.h
+++ b/src/gui/accessible/linux/qspi_struct_marshallers_p.h
@@ -76,7 +76,7 @@ struct QSpiObjectReference
     QSpiObjectReference(const QDBusConnection& connection, const QDBusObjectPath& path)
         : service(connection.baseService()), path(path) {}
 };
-Q_DECLARE_TYPEINFO(QSpiObjectReference, Q_MOVABLE_TYPE); // QDBusObjectPath is movable, even though it
+Q_DECLARE_TYPEINFO(QSpiObjectReference, Q_RELOCATABLE_TYPE); // QDBusObjectPath is movable, even though it
                                                          // cannot be marked that way until Qt 6
 
 QDBusArgument &operator<<(QDBusArgument &argument, const QSpiObjectReference &address);
@@ -96,7 +96,7 @@ struct QSpiAccessibleCacheItem
     QString                     description;
     QSpiUIntList                state;
 };
-Q_DECLARE_TYPEINFO(QSpiAccessibleCacheItem, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSpiAccessibleCacheItem, Q_RELOCATABLE_TYPE);
 
 typedef QList<QSpiAccessibleCacheItem> QSpiAccessibleCacheArray;
 
@@ -109,7 +109,7 @@ struct QSpiAction
     QString description;
     QString keyBinding;
 };
-Q_DECLARE_TYPEINFO(QSpiAction, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSpiAction, Q_RELOCATABLE_TYPE);
 
 typedef QList<QSpiAction> QSpiActionArray;
 
@@ -121,7 +121,7 @@ struct QSpiEventListener
     QString listenerAddress;
     QString eventName;
 };
-Q_DECLARE_TYPEINFO(QSpiEventListener, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSpiEventListener, Q_RELOCATABLE_TYPE);
 
 typedef QList<QSpiEventListener> QSpiEventListenerArray;
 
@@ -138,7 +138,7 @@ struct QSpiTextRange {
     QString contents;
     QVariant v;
 };
-Q_DECLARE_TYPEINFO(QSpiTextRange, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSpiTextRange, Q_RELOCATABLE_TYPE);
 
 typedef QList<QSpiTextRange> QSpiTextRangeList;
 typedef QMap <QString, QString> QSpiAttributeSet;
@@ -153,7 +153,7 @@ struct QSpiAppUpdate {
     int type; /* Is an application added or removed */
     QString address; /* D-Bus address of application added or removed */
 };
-Q_DECLARE_TYPEINFO(QSpiAppUpdate, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSpiAppUpdate, Q_RELOCATABLE_TYPE);
 
 QDBusArgument &operator<<(QDBusArgument &argument, const QSpiAppUpdate &update);
 const QDBusArgument &operator>>(const QDBusArgument &argument, QSpiAppUpdate &update);
@@ -167,7 +167,7 @@ struct QSpiDeviceEvent {
     QString text;
     bool isText;
 };
-Q_DECLARE_TYPEINFO(QSpiDeviceEvent, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSpiDeviceEvent, Q_RELOCATABLE_TYPE);
 
 QDBusArgument &operator<<(QDBusArgument &argument, const QSpiDeviceEvent &event);
 const QDBusArgument &operator>>(const QDBusArgument &argument, QSpiDeviceEvent &event);
-- 
cgit v1.2.3