diff options
| author | Andreas Buhr <andreas@andreasbuhr.de> | 2020-12-21 13:02:37 +0100 |
|---|---|---|
| committer | Andreas Buhr <andreas@andreasbuhr.de> | 2020-12-22 14:06:00 +0100 |
| commit | a8697ce4323a37b3ef3825c82d2d0b2c2203f886 (patch) | |
| tree | c144dccccaa23fe0fe3978eecc650939a6007e78 /src/plugins/renderers/rhi | |
| parent | a68893a6e7b74ddef2d2e6c487d7d58d9c0740ba (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 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>
Diffstat (limited to 'src/plugins/renderers/rhi')
| -rw-r--r-- | src/plugins/renderers/rhi/renderer/shaderparameterpack_p.h | 2 | ||||
| -rw-r--r-- | src/plugins/renderers/rhi/renderer/shadervariables_p.h | 8 |
2 files changed, 5 insertions, 5 deletions
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 |