diff options
author | Paul Lemire <paul.lemire@kdab.com> | 2016-02-22 20:04:59 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-02-22 21:17:52 +0000 |
commit | 382a79d92be025056ded362571b17ece9965edff (patch) | |
tree | ebbd0a9f089f89df924879827b70549e4c581a42 /src/render/backend | |
parent | 799bd03f73815a67ab6c394ff49e523731fe2c86 (diff) |
const QNodeId & -> QNodeId
Change-Id: Ia672918cbae3b950e20e68bfbfd6982676a5981e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/backend')
-rw-r--r-- | src/render/backend/entity.cpp | 18 | ||||
-rw-r--r-- | src/render/backend/entity_p.h | 6 | ||||
-rw-r--r-- | src/render/backend/managers.cpp | 6 | ||||
-rw-r--r-- | src/render/backend/managers_p.h | 6 | ||||
-rw-r--r-- | src/render/backend/nodefunctor_p.h | 4 | ||||
-rw-r--r-- | src/render/backend/parameterpack.cpp | 4 | ||||
-rw-r--r-- | src/render/backend/parameterpack_p.h | 4 | ||||
-rw-r--r-- | src/render/backend/quniformvalue.cpp | 2 | ||||
-rw-r--r-- | src/render/backend/quniformvalue_p.h | 4 | ||||
-rw-r--r-- | src/render/backend/renderer.cpp | 2 | ||||
-rw-r--r-- | src/render/backend/renderersettings.cpp | 4 | ||||
-rw-r--r-- | src/render/backend/renderersettings_p.h | 4 | ||||
-rw-r--r-- | src/render/backend/rendertarget.cpp | 4 | ||||
-rw-r--r-- | src/render/backend/rendertarget_p.h | 4 | ||||
-rw-r--r-- | src/render/backend/triangleboundingvolume.cpp | 2 | ||||
-rw-r--r-- | src/render/backend/triangleboundingvolume_p.h | 2 |
16 files changed, 38 insertions, 38 deletions
diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp index 4af409771..fe332ce44 100644 --- a/src/render/backend/entity.cpp +++ b/src/render/backend/entity.cpp @@ -291,7 +291,7 @@ void Entity::addComponent(Qt3DCore::QComponent *component) } } -void Entity::removeComponent(const Qt3DCore::QNodeId &nodeId) +void Entity::removeComponent(Qt3DCore::QNodeId nodeId) { if (m_transformComponent == nodeId) { m_transformComponent = QNodeId(); @@ -374,7 +374,7 @@ QList<HLayer> Entity::componentsHandle<Layer>() const { QList<HLayer> layerHandles; layerHandles.reserve(m_layerComponents.size()); - Q_FOREACH (const QNodeId &id, m_layerComponents) + Q_FOREACH (QNodeId id, m_layerComponents) layerHandles.append(m_nodeManagers->layerManager()->lookupHandle(id)); return layerHandles; } @@ -384,7 +384,7 @@ QList<HShaderData> Entity::componentsHandle<ShaderData>() const { QList<HShaderData> shaderDataHandles; shaderDataHandles.reserve(m_shaderDataComponents.size()); - Q_FOREACH (const QNodeId &id, m_shaderDataComponents) + Q_FOREACH (QNodeId id, m_shaderDataComponents) shaderDataHandles.append(m_nodeManagers->shaderDataManager()->lookupHandle(id)); return shaderDataHandles; } @@ -400,7 +400,7 @@ QList<HLight> Entity::componentsHandle<Light>() const { QList<HLight> lightHandles; lightHandles.reserve(m_lightComponents.size()); - Q_FOREACH (const QNodeId &id, m_lightComponents) + Q_FOREACH (QNodeId id, m_lightComponents) lightHandles.append(m_nodeManagers->lightManager()->lookupHandle(id)); return lightHandles; } @@ -448,7 +448,7 @@ QList<Layer *> Entity::renderComponents<Layer>() const { QList<Layer *> layers; layers.reserve(m_layerComponents.size()); - Q_FOREACH (const QNodeId &id, m_layerComponents) + Q_FOREACH (QNodeId id, m_layerComponents) layers.append(m_nodeManagers->layerManager()->lookupResource(id)); return layers; } @@ -458,7 +458,7 @@ QList<ShaderData *> Entity::renderComponents<ShaderData>() const { QList<ShaderData *> shaderDatas; shaderDatas.reserve(m_shaderDataComponents.size()); - Q_FOREACH (const QNodeId &id, m_shaderDataComponents) + Q_FOREACH (QNodeId id, m_shaderDataComponents) shaderDatas.append(m_nodeManagers->shaderDataManager()->lookupResource(id)); return shaderDatas; } @@ -468,7 +468,7 @@ QList<Light *> Entity::renderComponents<Light>() const { QList<Light *> lights; lights.reserve(m_lightComponents.size()); - Q_FOREACH (const QNodeId &id, m_lightComponents) + Q_FOREACH (QNodeId id, m_lightComponents) lights.append(m_nodeManagers->lightManager()->lookupResource(id)); return lights; } @@ -532,12 +532,12 @@ Qt3DCore::QBackendNode *RenderEntityFunctor::create(Qt3DCore::QNode *frontend) c return entity; } -Qt3DCore::QBackendNode *RenderEntityFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *RenderEntityFunctor::get(Qt3DCore::QNodeId id) const { return m_nodeManagers->renderNodesManager()->lookupResource(id); } -void RenderEntityFunctor::destroy(const Qt3DCore::QNodeId &id) const +void RenderEntityFunctor::destroy(Qt3DCore::QNodeId id) const { m_nodeManagers->renderNodesManager()->releaseResource(id); } diff --git a/src/render/backend/entity_p.h b/src/render/backend/entity_p.h index ae88e3320..c5b4f00ee 100644 --- a/src/render/backend/entity_p.h +++ b/src/render/backend/entity_p.h @@ -111,7 +111,7 @@ public: Sphere *worldBoundingVolumeWithChildren() const { return m_worldBoundingVolumeWithChildren.data(); } void addComponent(Qt3DCore::QComponent *component); - void removeComponent(const Qt3DCore::QNodeId &nodeId); + void removeComponent(Qt3DCore::QNodeId nodeId); bool isEnabled() const; void setEnabled(bool isEnabled); @@ -281,8 +281,8 @@ class RenderEntityFunctor : public Qt3DCore::QBackendNodeFunctor public: explicit RenderEntityFunctor(NodeManagers *manager); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE; - Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: NodeManagers *m_nodeManagers; diff --git a/src/render/backend/managers.cpp b/src/render/backend/managers.cpp index 7c35c6ce5..9da270e05 100644 --- a/src/render/backend/managers.cpp +++ b/src/render/backend/managers.cpp @@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE namespace Qt3DRender { namespace Render { -bool FrameGraphManager::containsNode(const Qt3DCore::QNodeId &id) const +bool FrameGraphManager::containsNode(Qt3DCore::QNodeId id) const { return m_nodes.contains(id); } @@ -56,7 +56,7 @@ void FrameGraphManager::appendNode(FrameGraphNode *node) m_nodes.insert(node->peerUuid(), node); } -FrameGraphNode* FrameGraphManager::lookupNode(const Qt3DCore::QNodeId &id) const +FrameGraphNode* FrameGraphManager::lookupNode(Qt3DCore::QNodeId id) const { const QHash<Qt3DCore::QNodeId, FrameGraphNode*>::const_iterator it = m_nodes.find(id); if (it == m_nodes.end()) @@ -65,7 +65,7 @@ FrameGraphNode* FrameGraphManager::lookupNode(const Qt3DCore::QNodeId &id) const return *it; } -void FrameGraphManager::releaseNode(const Qt3DCore::QNodeId &id) +void FrameGraphManager::releaseNode(Qt3DCore::QNodeId id) { delete m_nodes.take(id); } diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h index 90487099e..858847dda 100644 --- a/src/render/backend/managers_p.h +++ b/src/render/backend/managers_p.h @@ -146,10 +146,10 @@ class Q_AUTOTEST_EXPORT FrameGraphManager public: FrameGraphManager() {} - bool containsNode(const Qt3DCore::QNodeId &id) const; + bool containsNode(Qt3DCore::QNodeId id) const; void appendNode(FrameGraphNode *node); - FrameGraphNode* lookupNode(const Qt3DCore::QNodeId &id) const; - void releaseNode(const Qt3DCore::QNodeId &id); + FrameGraphNode* lookupNode(Qt3DCore::QNodeId id) const; + void releaseNode(Qt3DCore::QNodeId id); private: QHash<Qt3DCore::QNodeId, FrameGraphNode*> m_nodes; diff --git a/src/render/backend/nodefunctor_p.h b/src/render/backend/nodefunctor_p.h index 2456a68e1..47aa3d873 100644 --- a/src/render/backend/nodefunctor_p.h +++ b/src/render/backend/nodefunctor_p.h @@ -76,12 +76,12 @@ public: return backend; } - Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL { return m_manager->lookupResource(id); } - void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL + void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL { m_manager->releaseResource(id); } diff --git a/src/render/backend/parameterpack.cpp b/src/render/backend/parameterpack.cpp index d8306c5b1..c997c740e 100644 --- a/src/render/backend/parameterpack.cpp +++ b/src/render/backend/parameterpack.cpp @@ -57,14 +57,14 @@ void ParameterPack::clear() m_peers.clear(); } -void ParameterPack::appendParameter(const Qt3DCore::QNodeId ¶meterId) +void ParameterPack::appendParameter(Qt3DCore::QNodeId parameterId) { if (!m_peers.contains(parameterId)) { m_peers.append(parameterId); } } -void ParameterPack::removeParameter(const Qt3DCore::QNodeId ¶meterId) +void ParameterPack::removeParameter(Qt3DCore::QNodeId parameterId) { m_peers.removeOne(parameterId); } diff --git a/src/render/backend/parameterpack_p.h b/src/render/backend/parameterpack_p.h index c9e22a73b..31218e60d 100644 --- a/src/render/backend/parameterpack_p.h +++ b/src/render/backend/parameterpack_p.h @@ -66,8 +66,8 @@ public: ParameterPack(); ~ParameterPack(); void clear(); - void appendParameter(const Qt3DCore::QNodeId ¶meterId); - void removeParameter(const Qt3DCore::QNodeId ¶meterId); + void appendParameter(Qt3DCore::QNodeId parameterId); + void removeParameter(Qt3DCore::QNodeId parameterId); QList<Qt3DCore::QNodeId> parameters() const; private: diff --git a/src/render/backend/quniformvalue.cpp b/src/render/backend/quniformvalue.cpp index 624349eec..f2a9f0874 100644 --- a/src/render/backend/quniformvalue.cpp +++ b/src/render/backend/quniformvalue.cpp @@ -95,7 +95,7 @@ void ShaderParameterPack::setUniform(const int glslNameId, const QUniformValue & m_uniforms.insert(glslNameId, val); } -void ShaderParameterPack::setTexture(const int glslNameId, const Qt3DCore::QNodeId &texId) +void ShaderParameterPack::setTexture(const int glslNameId, Qt3DCore::QNodeId texId) { for (int t=0; t<m_textures.size(); ++t) { if (m_textures[t].glslNameId != glslNameId) diff --git a/src/render/backend/quniformvalue_p.h b/src/render/backend/quniformvalue_p.h index bcb8ef0e1..2140b3b5e 100644 --- a/src/render/backend/quniformvalue_p.h +++ b/src/render/backend/quniformvalue_p.h @@ -204,7 +204,7 @@ public: ~ShaderParameterPack(); void setUniform(const int glslNameId, const QUniformValue &val); - void setTexture(const int glslNameId, const Qt3DCore::QNodeId &id); + void setTexture(const int glslNameId, Qt3DCore::QNodeId id); void setUniformBuffer(const BlockToUBO &blockToUBO); void setShaderStorageBuffer(const BlockToSSBO &blockToSSBO); @@ -215,7 +215,7 @@ public: struct NamedTexture { NamedTexture() {} - NamedTexture(const int nm, const Qt3DCore::QNodeId &t) + NamedTexture(const int nm, Qt3DCore::QNodeId t) : glslNameId(nm) , texId(t) { } diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index 3d8fe65fe..71e19ed95 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -975,7 +975,7 @@ Attribute *Renderer::updateBuffersAndAttributes(Geometry *geometry, RenderComman uint estimatedCount = 0; m_dirtyAttributes.reserve(m_dirtyAttributes.size() + geometry->attributes().size()); - Q_FOREACH (const QNodeId &attributeId, geometry->attributes()) { + Q_FOREACH (QNodeId attributeId, geometry->attributes()) { // TO DO: Improvement we could store handles and use the non locking policy on the attributeManager Attribute *attribute = m_nodesManager->attributeManager()->lookupResource(attributeId); diff --git a/src/render/backend/renderersettings.cpp b/src/render/backend/renderersettings.cpp index 75d0181bd..2dc34caa4 100644 --- a/src/render/backend/renderersettings.cpp +++ b/src/render/backend/renderersettings.cpp @@ -98,13 +98,13 @@ Qt3DCore::QBackendNode *RendererSettingsFunctor::create(Qt3DCore::QNode *fronten return settings; } -Qt3DCore::QBackendNode *RendererSettingsFunctor::get(const Qt3DCore::QNodeId &id) const +Qt3DCore::QBackendNode *RendererSettingsFunctor::get(Qt3DCore::QNodeId id) const { Q_UNUSED(id); return Q_NULLPTR; } -void RendererSettingsFunctor::destroy(const Qt3DCore::QNodeId &id) const +void RendererSettingsFunctor::destroy(Qt3DCore::QNodeId id) const { Q_UNUSED(id); // Deletes the old settings object diff --git a/src/render/backend/renderersettings_p.h b/src/render/backend/renderersettings_p.h index 10707000b..224688c69 100644 --- a/src/render/backend/renderersettings_p.h +++ b/src/render/backend/renderersettings_p.h @@ -80,8 +80,8 @@ class RendererSettingsFunctor : public Qt3DCore::QBackendNodeFunctor public: explicit RendererSettingsFunctor(AbstractRenderer *renderer); Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_OVERRIDE; - Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; - void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE; + Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; + void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE; private: AbstractRenderer *m_renderer; diff --git a/src/render/backend/rendertarget.cpp b/src/render/backend/rendertarget.cpp index 9212f3a70..bc46bd657 100644 --- a/src/render/backend/rendertarget.cpp +++ b/src/render/backend/rendertarget.cpp @@ -67,13 +67,13 @@ void RenderTarget::cleanup() { } -void RenderTarget::appendRenderAttachment(const QNodeId &attachmentId) +void RenderTarget::appendRenderAttachment(QNodeId attachmentId) { if (!m_renderAttachments.contains(attachmentId)) m_renderAttachments.append(attachmentId); } -void RenderTarget::removeRenderAttachment(const QNodeId &attachmentId) +void RenderTarget::removeRenderAttachment(QNodeId attachmentId) { m_renderAttachments.removeOne(attachmentId); } diff --git a/src/render/backend/rendertarget_p.h b/src/render/backend/rendertarget_p.h index 0c7cf8683..036bae25a 100644 --- a/src/render/backend/rendertarget_p.h +++ b/src/render/backend/rendertarget_p.h @@ -74,8 +74,8 @@ public: void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE; void cleanup(); - void appendRenderAttachment(const Qt3DCore::QNodeId &attachmentId); - void removeRenderAttachment(const Qt3DCore::QNodeId &attachmentId); + void appendRenderAttachment(Qt3DCore::QNodeId attachmentId); + void removeRenderAttachment(Qt3DCore::QNodeId attachmentId); QList<Qt3DCore::QNodeId> renderAttachments() const; diff --git a/src/render/backend/triangleboundingvolume.cpp b/src/render/backend/triangleboundingvolume.cpp index 9bb895915..7e5aa6e31 100644 --- a/src/render/backend/triangleboundingvolume.cpp +++ b/src/render/backend/triangleboundingvolume.cpp @@ -99,7 +99,7 @@ TriangleBoundingVolume::TriangleBoundingVolume() /*! The vertices a, b, c are assumed to be in counter clockwise order. */ -TriangleBoundingVolume::TriangleBoundingVolume(const Qt3DCore::QNodeId &id, const QVector3D &a, const QVector3D &b, const QVector3D &c) +TriangleBoundingVolume::TriangleBoundingVolume(Qt3DCore::QNodeId id, const QVector3D &a, const QVector3D &b, const QVector3D &c) : QBoundingVolume() , m_id(id) , m_a(a) diff --git a/src/render/backend/triangleboundingvolume_p.h b/src/render/backend/triangleboundingvolume_p.h index 7ee5c3627..4a36caacb 100644 --- a/src/render/backend/triangleboundingvolume_p.h +++ b/src/render/backend/triangleboundingvolume_p.h @@ -72,7 +72,7 @@ class Q_AUTOTEST_EXPORT TriangleBoundingVolume : public QBoundingVolume { public: TriangleBoundingVolume(); - explicit TriangleBoundingVolume(const Qt3DCore::QNodeId &id, + explicit TriangleBoundingVolume(Qt3DCore::QNodeId id, const QVector3D &a, const QVector3D &b, const QVector3D &c); |