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>

10 files changed, 20 insertions, 20 deletions

diff --git a/src/corelib/kernel/qassociativeiterable.h b/src/corelib/kernel/qassociativeiterable.h
index 4a1942fbc9..b940f605b8 100644
--- a/src/corelib/kernel/qassociativeiterable.h
+++ b/src/corelib/kernel/qassociativeiterable.h
@@ -198,9 +198,9 @@ inline QVariantRef<QAssociativeIterator> &QVariantRef<QAssociativeIterator>::ope
     return *this;
 }
 
-Q_DECLARE_TYPEINFO(QAssociativeIterable, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QAssociativeIterable::iterator, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QAssociativeIterable::const_iterator, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QAssociativeIterable, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QAssociativeIterable::iterator, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QAssociativeIterable::const_iterator, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
diff --git a/src/corelib/kernel/qbasictimer.h b/src/corelib/kernel/qbasictimer.h
index 64a9acbe6e..6a2728dd56 100644
--- a/src/corelib/kernel/qbasictimer.h
+++ b/src/corelib/kernel/qbasictimer.h
@@ -72,7 +72,7 @@ public:
     void start(int msec, Qt::TimerType timerType, QObject *obj);
     void stop();
 };
-Q_DECLARE_TYPEINFO(QBasicTimer, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QBasicTimer, Q_RELOCATABLE_TYPE);
 
 inline void swap(QBasicTimer &lhs, QBasicTimer &rhs) noexcept { lhs.swap(rhs); }
 
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
 
diff --git a/src/corelib/kernel/qmetaobject_p.h b/src/corelib/kernel/qmetaobject_p.h
index f98185ac81..efc1eafc8f 100644
--- a/src/corelib/kernel/qmetaobject_p.h
+++ b/src/corelib/kernel/qmetaobject_p.h
@@ -161,7 +161,7 @@ private:
     int _type;
     QByteArray _name;
 };
-Q_DECLARE_TYPEINFO(QArgumentType, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QArgumentType, Q_RELOCATABLE_TYPE);
 
 typedef QVarLengthArray<QArgumentType, 10> QArgumentTypeArray;
 
diff --git a/src/corelib/kernel/qmetaobjectbuilder.cpp b/src/corelib/kernel/qmetaobjectbuilder.cpp
index ad7a8ce4ab..f4df791ddf 100644
--- a/src/corelib/kernel/qmetaobjectbuilder.cpp
+++ b/src/corelib/kernel/qmetaobjectbuilder.cpp
@@ -146,7 +146,7 @@ public:
         return signature.left(qMax(signature.indexOf('('), 0));
     }
 };
-Q_DECLARE_TYPEINFO(QMetaMethodBuilderPrivate, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMetaMethodBuilderPrivate, Q_RELOCATABLE_TYPE);
 
 class QMetaPropertyBuilderPrivate
 {
@@ -183,7 +183,7 @@ public:
             flags &= ~f;
     }
 };
-Q_DECLARE_TYPEINFO(QMetaPropertyBuilderPrivate, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMetaPropertyBuilderPrivate, Q_RELOCATABLE_TYPE);
 
 class QMetaEnumBuilderPrivate
 {
@@ -200,7 +200,7 @@ public:
     QList<QByteArray> keys;
     QList<int> values;
 };
-Q_DECLARE_TYPEINFO(QMetaEnumBuilderPrivate, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMetaEnumBuilderPrivate, Q_RELOCATABLE_TYPE);
 
 class QMetaObjectBuilderPrivate
 {
diff --git a/src/corelib/kernel/qmetatype.h b/src/corelib/kernel/qmetatype.h
index e453c61d77..de6632ffc6 100644
--- a/src/corelib/kernel/qmetatype.h
+++ b/src/corelib/kernel/qmetatype.h
@@ -709,7 +709,7 @@ public:
     inline void first(void *dataPtr) const { _getFirst(&_pair, dataPtr); }
     inline void second(void *dataPtr) const { _getSecond(&_pair, dataPtr); }
 };
-QT_METATYPE_PRIVATE_DECLARE_TYPEINFO(QPairVariantInterfaceImpl, Q_MOVABLE_TYPE)
+QT_METATYPE_PRIVATE_DECLARE_TYPEINFO(QPairVariantInterfaceImpl, Q_RELOCATABLE_TYPE)
 
 template<typename From>
 struct QPairVariantInterfaceConvertFunctor;
diff --git a/src/corelib/kernel/qmimedata.cpp b/src/corelib/kernel/qmimedata.cpp
index d99874bd67..1ed416e3e8 100644
--- a/src/corelib/kernel/qmimedata.cpp
+++ b/src/corelib/kernel/qmimedata.cpp
@@ -58,7 +58,7 @@ struct QMimeDataStruct
     QString format;
     QVariant data;
 };
-Q_DECLARE_TYPEINFO(QMimeDataStruct, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QMimeDataStruct, Q_RELOCATABLE_TYPE);
 
 class QMimeDataPrivate : public QObjectPrivate
 {
diff --git a/src/corelib/kernel/qobject_p.h b/src/corelib/kernel/qobject_p.h
index 5fc12c3165..79539fbd55 100644
--- a/src/corelib/kernel/qobject_p.h
+++ b/src/corelib/kernel/qobject_p.h
@@ -387,7 +387,7 @@ public:
     QBindingStorage bindingStorage;
 };
 
-Q_DECLARE_TYPEINFO(QObjectPrivate::ConnectionList, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QObjectPrivate::ConnectionList, Q_RELOCATABLE_TYPE);
 
 /*
     Catch mixing of incompatible library versions.
@@ -498,8 +498,8 @@ bool QObjectPrivate::disconnect(const typename QtPrivate::FunctionPointer< Func1
                           &SignalType::Object::staticMetaObject);
 }
 
-Q_DECLARE_TYPEINFO(QObjectPrivate::Connection, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QObjectPrivate::Sender, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QObjectPrivate::Connection, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QObjectPrivate::Sender, Q_RELOCATABLE_TYPE);
 
 class QSemaphore;
 class Q_CORE_EXPORT QAbstractMetaCallEvent : public QEvent
diff --git a/src/corelib/kernel/qpointer.h b/src/corelib/kernel/qpointer.h
index 30c7d923fd..b877b56133 100644
--- a/src/corelib/kernel/qpointer.h
+++ b/src/corelib/kernel/qpointer.h
@@ -112,7 +112,7 @@ public:
 #undef DECLARE_COMPARE_SET
 #undef DECLARE_TEMPLATE_COMPARE_SET
 };
-template <class T> Q_DECLARE_TYPEINFO_BODY(QPointer<T>, Q_MOVABLE_TYPE);
+template <class T> Q_DECLARE_TYPEINFO_BODY(QPointer<T>, Q_RELOCATABLE_TYPE);
 
 template<typename T>
 QPointer<T>
diff --git a/src/corelib/kernel/qsequentialiterable.h b/src/corelib/kernel/qsequentialiterable.h
index a5a22b55df..8755b07aec 100644
--- a/src/corelib/kernel/qsequentialiterable.h
+++ b/src/corelib/kernel/qsequentialiterable.h
@@ -180,9 +180,9 @@ inline QVariantRef<QSequentialIterator> &QVariantRef<QSequentialIterator>::opera
     return *this;
 }
 
-Q_DECLARE_TYPEINFO(QSequentialIterable, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QSequentialIterable::iterator, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(QSequentialIterable::const_iterator, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSequentialIterable, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSequentialIterable::iterator, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(QSequentialIterable::const_iterator, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE