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 Qt3D. As the two are synonymous, this
patch should have no impact on users.

Task-number: QTBUG-86829
Change-Id: Ie63323a692e8937fa72f0225b48ccb703f479c47
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

15 files changed, 25 insertions, 25 deletions

diff --git a/src/core/qt3dcore_global.h b/src/core/qt3dcore_global.h
index acb724eb5..5d6ebac32 100644
--- a/src/core/qt3dcore_global.h
+++ b/src/core/qt3dcore_global.h
@@ -77,14 +77,14 @@ QT_BEGIN_NAMESPACE
     inline void swap(Class &lhs, Class &rhs) \
         noexcept(noexcept(lhs.swap(rhs))) \
     { lhs.swap(rhs); } \
-    QT3D_DECLARE_TYPEINFO(NS, Class, Q_MOVABLE_TYPE) \
+    QT3D_DECLARE_TYPEINFO(NS, Class, Q_RELOCATABLE_TYPE) \
     /*end*/
 
 #define QT3D_DECLARE_SHARED_2(OuterNS, InnerNS, Class) \
     inline void swap(Class &lhs, Class &rhs) \
         noexcept(noexcept(lhs.swap(rhs))) \
     { lhs.swap(rhs); } \
-    QT3D_DECLARE_TYPEINFO_2(OuterNS, InnerNS, Class, Q_MOVABLE_TYPE) \
+    QT3D_DECLARE_TYPEINFO_2(OuterNS, InnerNS, Class, Q_RELOCATABLE_TYPE) \
     /*end*/
 
 QT_END_NAMESPACE
diff --git a/src/plugins/renderers/opengl/renderer/shaderparameterpack_p.h b/src/plugins/renderers/opengl/renderer/shaderparameterpack_p.h
index 3e4bdc5a1..826350596 100644
--- a/src/plugins/renderers/opengl/renderer/shaderparameterpack_p.h
+++ b/src/plugins/renderers/opengl/renderer/shaderparameterpack_p.h
@@ -75,7 +75,7 @@ struct BlockToUBO {
     bool m_needsUpdate;
     QHash<QString, QVariant> m_updatedProperties;
 };
-QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, BlockToUBO, Q_MOVABLE_TYPE)
+QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, BlockToUBO, Q_RELOCATABLE_TYPE)
 
 struct BlockToSSBO {
     int m_blockIndex;
diff --git a/src/plugins/renderers/opengl/renderer/shadervariables_p.h b/src/plugins/renderers/opengl/renderer/shadervariables_p.h
index 94ea9b7e0..5dc50fccb 100644
--- a/src/plugins/renderers/opengl/renderer/shadervariables_p.h
+++ b/src/plugins/renderers/opengl/renderer/shadervariables_p.h
@@ -77,7 +77,7 @@ struct ShaderAttribute
     int m_size;
     int m_location;
 };
-QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, ShaderAttribute, Q_MOVABLE_TYPE)
+QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, ShaderAttribute, Q_RELOCATABLE_TYPE)
 
 struct Q_AUTOTEST_EXPORT ShaderUniform
 {
@@ -105,7 +105,7 @@ struct Q_AUTOTEST_EXPORT ShaderUniform
     uint m_rawByteSize; // contains byte size (size / type / strides)
     // size, offset and strides are in bytes
 };
-QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, ShaderUniform, Q_MOVABLE_TYPE)
+QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, ShaderUniform, Q_RELOCATABLE_TYPE)
 
 struct Q_AUTOTEST_EXPORT ShaderUniformBlock
 {
@@ -124,7 +124,7 @@ struct Q_AUTOTEST_EXPORT ShaderUniformBlock
     int m_activeUniformsCount;
     int m_size;
 };
-QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, ShaderUniformBlock, Q_MOVABLE_TYPE)
+QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, ShaderUniformBlock, Q_RELOCATABLE_TYPE)
 
 struct Q_AUTOTEST_EXPORT ShaderStorageBlock
 {
@@ -143,7 +143,7 @@ struct Q_AUTOTEST_EXPORT ShaderStorageBlock
     int m_size;
     int m_activeVariablesCount;
 };
-QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, ShaderStorageBlock, Q_MOVABLE_TYPE)
+QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, OpenGL, ShaderStorageBlock, Q_RELOCATABLE_TYPE)
 
 } // namespace OpenGL
 
diff --git a/src/plugins/renderers/rhi/renderer/shaderparameterpack_p.h b/src/plugins/renderers/rhi/renderer/shaderparameterpack_p.h
index fd10dfd95..edc732de0 100644
--- a/src/plugins/renderers/rhi/renderer/shaderparameterpack_p.h
+++ b/src/plugins/renderers/rhi/renderer/shaderparameterpack_p.h
@@ -82,7 +82,7 @@ struct BlockToUBO
     bool m_needsUpdate;
     QHash<QString, QVariant> m_updatedProperties;
 };
-QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, Rhi, BlockToUBO, Q_MOVABLE_TYPE)
+QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, Rhi, BlockToUBO, Q_RELOCATABLE_TYPE)
 
 struct BlockToSSBO
 {
diff --git a/src/plugins/renderers/rhi/renderer/shadervariables_p.h b/src/plugins/renderers/rhi/renderer/shadervariables_p.h
index 4e710a92c..bb8d205b5 100644
--- a/src/plugins/renderers/rhi/renderer/shadervariables_p.h
+++ b/src/plugins/renderers/rhi/renderer/shadervariables_p.h
@@ -71,7 +71,7 @@ struct ShaderAttribute
     int m_size {};
     int m_location { -1 };
 };
-QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, Rhi, ShaderAttribute, Q_MOVABLE_TYPE)
+QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, Rhi, ShaderAttribute, Q_RELOCATABLE_TYPE)
 
 struct ShaderUniform
 {
@@ -91,7 +91,7 @@ struct ShaderUniform
     uint m_rawByteSize { 0 }; // contains byte size (size / type / strides)
     // size, offset and strides are in bytes
 };
-QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, Rhi, ShaderUniform, Q_MOVABLE_TYPE)
+QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, Rhi, ShaderUniform, Q_RELOCATABLE_TYPE)
 
 struct ShaderUniformBlock
 {
@@ -102,7 +102,7 @@ struct ShaderUniformBlock
     int m_activeUniformsCount { 0 };
     int m_size { 0 };
 };
-QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, Rhi, ShaderUniformBlock, Q_MOVABLE_TYPE)
+QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, Rhi, ShaderUniformBlock, Q_RELOCATABLE_TYPE)
 
 struct ShaderStorageBlock
 {
@@ -113,7 +113,7 @@ struct ShaderStorageBlock
     int m_size { 0 };
     int m_activeVariablesCount { 0 };
 };
-QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, Rhi, ShaderStorageBlock, Q_MOVABLE_TYPE)
+QT3D_DECLARE_TYPEINFO_3(Qt3DRender, Render, Rhi, ShaderStorageBlock, Q_RELOCATABLE_TYPE)
 
 } // namespace Rhi
 
diff --git a/src/render/jobs/renderviewjobutils_p.h b/src/render/jobs/renderviewjobutils_p.h
index be1aee0e9..767b8399a 100644
--- a/src/render/jobs/renderviewjobutils_p.h
+++ b/src/render/jobs/renderviewjobutils_p.h
@@ -115,7 +115,7 @@ struct RenderPassParameterData
     RenderPass *pass;
     ParameterInfoList parameterInfo;
 };
-QT3D_DECLARE_TYPEINFO_2(Qt3DRender, Render, RenderPassParameterData, Q_MOVABLE_TYPE)
+QT3D_DECLARE_TYPEINFO_2(Qt3DRender, Render, RenderPassParameterData, Q_RELOCATABLE_TYPE)
 
 using MaterialParameterGathererData = QMultiHash<Qt3DCore::QNodeId, std::vector<RenderPassParameterData>>;
 
diff --git a/src/render/raycasting/qray3d_p.h b/src/render/raycasting/qray3d_p.h
index 7d1ac874e..aaf6734a1 100644
--- a/src/render/raycasting/qray3d_p.h
+++ b/src/render/raycasting/qray3d_p.h
@@ -100,7 +100,7 @@ private:
     Vector3D m_direction;
     float m_distance;
 };
-QT3D_DECLARE_TYPEINFO_2(Qt3DRender, RayCasting, QRay3D, Q_MOVABLE_TYPE)
+QT3D_DECLARE_TYPEINFO_2(Qt3DRender, RayCasting, QRay3D, Q_RELOCATABLE_TYPE)
 
 
 #ifndef QT_NO_DEBUG_STREAM
diff --git a/src/render/shadergraph/qshaderformat_p.h b/src/render/shadergraph/qshaderformat_p.h
index 2db150de2..c2775e642 100644
--- a/src/render/shadergraph/qshaderformat_p.h
+++ b/src/render/shadergraph/qshaderformat_p.h
@@ -118,7 +118,7 @@ inline bool operator!=(const QShaderFormat &lhs, const QShaderFormat &rhs) noexc
 
 
 }
-Q_DECLARE_TYPEINFO(Qt3DRender::QShaderFormat, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Qt3DRender::QShaderFormat, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Qt3DRender::QShaderFormat)
diff --git a/src/render/shadergraph/qshadergenerator_p.h b/src/render/shadergraph/qshadergenerator_p.h
index aebeaa8f2..fab9340dc 100644
--- a/src/render/shadergraph/qshadergenerator_p.h
+++ b/src/render/shadergraph/qshadergenerator_p.h
@@ -73,7 +73,7 @@ public:
 };
 
 }
-Q_DECLARE_TYPEINFO(Qt3DRender::QShaderGenerator, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Qt3DRender::QShaderGenerator, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Qt3DRender::QShaderGenerator)
diff --git a/src/render/shadergraph/qshadergraph_p.h b/src/render/shadergraph/qshadergraph_p.h
index e3840f68e..ed7246ed0 100644
--- a/src/render/shadergraph/qshadergraph_p.h
+++ b/src/render/shadergraph/qshadergraph_p.h
@@ -114,9 +114,9 @@ inline bool operator!=(const QShaderGraph::Statement &lhs, const QShaderGraph::S
 
 }
 
-Q_DECLARE_TYPEINFO(Qt3DRender::QShaderGraph, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(Qt3DRender::QShaderGraph::Edge, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(Qt3DRender::QShaderGraph::Statement, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Qt3DRender::QShaderGraph, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(Qt3DRender::QShaderGraph::Edge, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(Qt3DRender::QShaderGraph::Statement, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Qt3DRender::QShaderGraph)
diff --git a/src/render/shadergraph/qshadergraphloader_p.h b/src/render/shadergraph/qshadergraphloader_p.h
index 20589d724..8f6884e7e 100644
--- a/src/render/shadergraph/qshadergraphloader_p.h
+++ b/src/render/shadergraph/qshadergraphloader_p.h
@@ -93,7 +93,7 @@ private:
 
 
 }
-Q_DECLARE_TYPEINFO(Qt3DRender::QShaderGraphLoader, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Qt3DRender::QShaderGraphLoader, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Qt3DRender::QShaderGraphLoader)
diff --git a/src/render/shadergraph/qshadernode_p.h b/src/render/shadergraph/qshadernode_p.h
index 603ecf7b0..9fa4851a5 100644
--- a/src/render/shadergraph/qshadernode_p.h
+++ b/src/render/shadergraph/qshadernode_p.h
@@ -121,8 +121,8 @@ inline bool operator!=(const QShaderNode::Rule &lhs, const QShaderNode::Rule &rh
 
 }
 
-Q_DECLARE_TYPEINFO(Qt3DRender::QShaderNode, Q_MOVABLE_TYPE);
-Q_DECLARE_TYPEINFO(Qt3DRender::QShaderNode::Rule, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Qt3DRender::QShaderNode, Q_RELOCATABLE_TYPE);
+Q_DECLARE_TYPEINFO(Qt3DRender::QShaderNode::Rule, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Qt3DRender::QShaderNode)
diff --git a/src/render/shadergraph/qshadernodeport_p.h b/src/render/shadergraph/qshadernodeport_p.h
index d83cdb8c4..de6de9142 100644
--- a/src/render/shadergraph/qshadernodeport_p.h
+++ b/src/render/shadergraph/qshadernodeport_p.h
@@ -83,7 +83,7 @@ inline bool operator!=(const QShaderNodePort &lhs, const QShaderNodePort &rhs) n
 
 
 }
-Q_DECLARE_TYPEINFO(Qt3DRender::QShaderNodePort, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Qt3DRender::QShaderNodePort, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Qt3DRender::QShaderNodePort)
diff --git a/src/render/shadergraph/qshadernodesloader_p.h b/src/render/shadergraph/qshadernodesloader_p.h
index 80d75a0bc..67711a8d5 100644
--- a/src/render/shadergraph/qshadernodesloader_p.h
+++ b/src/render/shadergraph/qshadernodesloader_p.h
@@ -90,7 +90,7 @@ private:
 
 
 }
-Q_DECLARE_TYPEINFO(Qt3DRender::QShaderNodesLoader, Q_MOVABLE_TYPE);
+Q_DECLARE_TYPEINFO(Qt3DRender::QShaderNodesLoader, Q_RELOCATABLE_TYPE);
 QT_END_NAMESPACE
 
 Q_DECLARE_METATYPE(Qt3DRender::QShaderNodesLoader)
diff --git a/src/render/texture/qtexturedataupdate.h b/src/render/texture/qtexturedataupdate.h
index 3505d85fa..f222fd6ec 100644
--- a/src/render/texture/qtexturedataupdate.h
+++ b/src/render/texture/qtexturedataupdate.h
@@ -88,7 +88,7 @@ private:
     Q_DECLARE_PRIVATE(QTextureDataUpdate)
     QExplicitlySharedDataPointer<QTextureDataUpdatePrivate> d_ptr;
 };
-QT3D_DECLARE_TYPEINFO(Qt3DRender, QTextureDataUpdate, Q_MOVABLE_TYPE)
+QT3D_DECLARE_TYPEINFO(Qt3DRender, QTextureDataUpdate, Q_RELOCATABLE_TYPE)
 
 inline bool operator!=(const QTextureDataUpdate &lhs, const QTextureDataUpdate &rhs) noexcept
 { return !operator==(lhs, rhs); }