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/tools/moc/moc.h                        | 20 ++++++++++----------
 src/tools/moc/symbols.h                    |  4 ++--
 src/tools/tracegen/provider.h              |  6 +++---
 src/tools/uic/cpp/cppwriteinitialization.h |  2 +-
 4 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'src/tools')

diff --git a/src/tools/moc/moc.h b/src/tools/moc/moc.h
index 5ce057210f..889ee15652 100644
--- a/src/tools/moc/moc.h
+++ b/src/tools/moc/moc.h
@@ -60,7 +60,7 @@ struct Type
     Token firstToken;
     ReferenceType referenceType;
 };
-Q_DECLARE_TYPEINFO(Type, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Type, Q_RELOCATABLE_TYPE);
 
 struct ClassDef;
 struct EnumDef
@@ -72,7 +72,7 @@ struct EnumDef
     EnumDef() : isEnumClass(false) {}
     QJsonObject toJson(const ClassDef &cdef) const;
 };
-Q_DECLARE_TYPEINFO(EnumDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(EnumDef, Q_RELOCATABLE_TYPE);
 
 struct ArgumentDef
 {
@@ -84,7 +84,7 @@ struct ArgumentDef
 
     QJsonObject toJson() const;
 };
-Q_DECLARE_TYPEINFO(ArgumentDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(ArgumentDef, Q_RELOCATABLE_TYPE);
 
 struct FunctionDef
 {
@@ -121,7 +121,7 @@ struct FunctionDef
     QJsonObject toJson() const;
     static void accessToJson(QJsonObject *obj, Access acs);
 };
-Q_DECLARE_TYPEINFO(FunctionDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(FunctionDef, Q_RELOCATABLE_TYPE);
 
 struct PropertyDef
 {
@@ -145,7 +145,7 @@ struct PropertyDef
 
     QJsonObject toJson() const;
 };
-Q_DECLARE_TYPEINFO(PropertyDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(PropertyDef, Q_RELOCATABLE_TYPE);
 
 struct PrivateQPropertyDef
 {
@@ -155,14 +155,14 @@ struct PrivateQPropertyDef
     QByteArray accessor;
     QByteArray storage;
 };
-Q_DECLARE_TYPEINFO(PrivateQPropertyDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(PrivateQPropertyDef, Q_RELOCATABLE_TYPE);
 
 struct ClassInfoDef
 {
     QByteArray name;
     QByteArray value;
 };
-Q_DECLARE_TYPEINFO(ClassInfoDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(ClassInfoDef, Q_RELOCATABLE_TYPE);
 
 struct BaseDef {
     QByteArray classname;
@@ -208,14 +208,14 @@ struct ClassDef : BaseDef {
 
     QJsonObject toJson() const;
 };
-Q_DECLARE_TYPEINFO(ClassDef, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(ClassDef::Interface, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(ClassDef, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(ClassDef::Interface, Q_RELOCATABLE_TYPE);
 
 struct NamespaceDef : BaseDef {
     bool hasQNamespace = false;
     bool doGenerate = false;
 };
-Q_DECLARE_TYPEINFO(NamespaceDef, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(NamespaceDef, Q_RELOCATABLE_TYPE);
 
 class Moc : public Parser
 {
diff --git a/src/tools/moc/symbols.h b/src/tools/moc/symbols.h
index dfc682f0bf..bbb1312cdc 100644
--- a/src/tools/moc/symbols.h
+++ b/src/tools/moc/symbols.h
@@ -118,7 +118,7 @@ struct Symbol
 
 #endif
 };
-Q_DECLARE_TYPEINFO(Symbol, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Symbol, Q_RELOCATABLE_TYPE);
 
 typedef QList<Symbol> Symbols;
 
@@ -128,7 +128,7 @@ struct SafeSymbols {
     QSet<QByteArray> excludedSymbols;
     int index;
 };
-Q_DECLARE_TYPEINFO(SafeSymbols, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(SafeSymbols, Q_RELOCATABLE_TYPE);
 
 class SymbolStack : public QStack<SafeSymbols>
 {
diff --git a/src/tools/tracegen/provider.h b/src/tools/tracegen/provider.h
index a62522adc7..99b10b13f1 100644
--- a/src/tools/tracegen/provider.h
+++ b/src/tools/tracegen/provider.h
@@ -92,8 +92,8 @@ struct Provider
 
 Provider parseProvider(const QString &filename);
 
-Q_DECLARE_TYPEINFO(Tracepoint::Argument, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(Tracepoint::Field, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(Tracepoint, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Tracepoint::Argument, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(Tracepoint::Field, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(Tracepoint, Q_RELOCATABLE_TYPE);
 
 #endif // PROVIDER_H
diff --git a/src/tools/uic/cpp/cppwriteinitialization.h b/src/tools/uic/cpp/cppwriteinitialization.h
index 784ef6fe3e..41eca9f0cb 100644
--- a/src/tools/uic/cpp/cppwriteinitialization.h
+++ b/src/tools/uic/cpp/cppwriteinitialization.h
@@ -325,7 +325,7 @@ private:
 
 } // namespace CPP
 
-Q_DECLARE_TYPEINFO(CPP::WriteInitialization::Buddy, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(CPP::WriteInitialization::Buddy, Q_RELOCATABLE_TYPE);
 
 QT_END_NAMESPACE
 
-- 
cgit v1.2.3