const QNodeId & -> QNodeId

Change-Id: Ia672918cbae3b950e20e68bfbfd6982676a5981e
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>

66 files changed, 145 insertions, 145 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 &parameterId)
+void ParameterPack::appendParameter(Qt3DCore::QNodeId parameterId)
 {
     if (!m_peers.contains(parameterId)) {
         m_peers.append(parameterId);
     }
 }
 
-void ParameterPack::removeParameter(const Qt3DCore::QNodeId &parameterId)
+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 &parameterId);
-    void removeParameter(const Qt3DCore::QNodeId &parameterId);
+    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);
diff --git a/src/render/framegraph/framegraphnode.cpp b/src/render/framegraph/framegraphnode.cpp
index 7b76f29ce..f264021b6 100644
--- a/src/render/framegraph/framegraphnode.cpp
+++ b/src/render/framegraph/framegraphnode.cpp
@@ -77,7 +77,7 @@ FrameGraphManager *FrameGraphNode::manager() const
     return m_manager;
 }
 
-void FrameGraphNode::setParentId(const Qt3DCore::QNodeId &parentId)
+void FrameGraphNode::setParentId(Qt3DCore::QNodeId parentId)
 {
     if (m_parentId != parentId) {
         m_parentId = parentId;
@@ -87,7 +87,7 @@ void FrameGraphNode::setParentId(const Qt3DCore::QNodeId &parentId)
     }
 }
 
-void FrameGraphNode::appendChildId(const Qt3DCore::QNodeId &childId)
+void FrameGraphNode::appendChildId(Qt3DCore::QNodeId childId)
 {
     if (!m_childrenIds.contains(childId)) {
         FrameGraphNode *child = m_manager->lookupNode(childId);
@@ -98,7 +98,7 @@ void FrameGraphNode::appendChildId(const Qt3DCore::QNodeId &childId)
     }
 }
 
-void FrameGraphNode::removeChildId(const Qt3DCore::QNodeId &childId)
+void FrameGraphNode::removeChildId(Qt3DCore::QNodeId childId)
 {
     if (m_childrenIds.contains(childId)) {
         FrameGraphNode *child = m_manager->lookupNode(childId);
@@ -129,7 +129,7 @@ QList<FrameGraphNode *> FrameGraphNode::children() const
     QList<FrameGraphNode *> children;
     children.reserve(m_childrenIds.size());
 
-    Q_FOREACH (const Qt3DCore::QNodeId &id, m_childrenIds) {
+    Q_FOREACH (Qt3DCore::QNodeId id, m_childrenIds) {
         FrameGraphNode *child = m_manager->lookupNode(id);
         if (child != Q_NULLPTR)
             children << child;
@@ -153,13 +153,13 @@ Qt3DCore::QBackendNode *FrameGraphComponentFunctor::create(Qt3DCore::QNode *fron
     return Q_NULLPTR;
 }
 
-Qt3DCore::QBackendNode *FrameGraphComponentFunctor::get(const Qt3DCore::QNodeId &id) const
+Qt3DCore::QBackendNode *FrameGraphComponentFunctor::get(Qt3DCore::QNodeId id) const
 {
     Q_UNUSED(id);
     return Q_NULLPTR;
 }
 
-void FrameGraphComponentFunctor::destroy(const Qt3DCore::QNodeId &id) const
+void FrameGraphComponentFunctor::destroy(Qt3DCore::QNodeId id) const
 {
     Q_UNUSED(id);
 }
diff --git a/src/render/framegraph/framegraphnode_p.h b/src/render/framegraph/framegraphnode_p.h
index e6d35849a..d8b5e8b5b 100644
--- a/src/render/framegraph/framegraphnode_p.h
+++ b/src/render/framegraph/framegraphnode_p.h
@@ -99,9 +99,9 @@ public:
     void setFrameGraphManager(FrameGraphManager *manager);
     FrameGraphManager *manager() const;
 
-    void setParentId(const Qt3DCore::QNodeId &parentId);
-    void appendChildId(const Qt3DCore::QNodeId &childHandle);
-    void removeChildId(const Qt3DCore::QNodeId &childHandle);
+    void setParentId(Qt3DCore::QNodeId parentId);
+    void appendChildId(Qt3DCore::QNodeId childHandle);
+    void removeChildId(Qt3DCore::QNodeId childHandle);
 
     Qt3DCore::QNodeId parentId() const;
     QList<Qt3DCore::QNodeId> childrenIds() const;
@@ -136,12 +136,12 @@ public:
         return createBackendFrameGraphNode(frontend);
     }
 
-    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE
     {
         return m_manager->lookupNode(id);
     }
 
-    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_OVERRIDE
+    void destroy(Qt3DCore::QNodeId id) const Q_DECL_OVERRIDE
     {
         m_manager->releaseNode(id);
     }
@@ -175,8 +175,8 @@ class FrameGraphComponentFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit FrameGraphComponentFunctor(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/framegraph/renderpassfilternode.cpp b/src/render/framegraph/renderpassfilternode.cpp
index b83670417..21e05ac53 100644
--- a/src/render/framegraph/renderpassfilternode.cpp
+++ b/src/render/framegraph/renderpassfilternode.cpp
@@ -72,13 +72,13 @@ QList<Qt3DCore::QNodeId> RenderPassFilter::filters() const
     return m_filters;
 }
 
-void RenderPassFilter::appendFilter(const Qt3DCore::QNodeId &criterionId)
+void RenderPassFilter::appendFilter(Qt3DCore::QNodeId criterionId)
 {
     if (!m_filters.contains(criterionId))
         m_filters.append(criterionId);
 }
 
-void RenderPassFilter::removeFilter(const Qt3DCore::QNodeId &criterionId)
+void RenderPassFilter::removeFilter(Qt3DCore::QNodeId criterionId)
 {
     m_filters.removeOne(criterionId);
 }
diff --git a/src/render/framegraph/renderpassfilternode_p.h b/src/render/framegraph/renderpassfilternode_p.h
index 4dd3abbdd..762b3e756 100644
--- a/src/render/framegraph/renderpassfilternode_p.h
+++ b/src/render/framegraph/renderpassfilternode_p.h
@@ -76,8 +76,8 @@ public:
     void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     QList<Qt3DCore::QNodeId> filters() const;
     QList<Qt3DCore::QNodeId> parameters() const;
-    void appendFilter(const Qt3DCore::QNodeId &criterionId);
-    void removeFilter(const Qt3DCore::QNodeId &criterionId);
+    void appendFilter(Qt3DCore::QNodeId criterionId);
+    void removeFilter(Qt3DCore::QNodeId criterionId);
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
diff --git a/src/render/framegraph/techniquefilternode.cpp b/src/render/framegraph/techniquefilternode.cpp
index 49df8a298..87eff80a6 100644
--- a/src/render/framegraph/techniquefilternode.cpp
+++ b/src/render/framegraph/techniquefilternode.cpp
@@ -78,13 +78,13 @@ QList<Qt3DCore::QNodeId> TechniqueFilter::filters() const
     return m_filters;
 }
 
-void TechniqueFilter::appendFilter(const QNodeId &criterionId)
+void TechniqueFilter::appendFilter(QNodeId criterionId)
 {
     if (!m_filters.contains(criterionId))
         m_filters.append(criterionId);
 }
 
-void TechniqueFilter::removeFilter(const Qt3DCore::QNodeId &criterionId)
+void TechniqueFilter::removeFilter(Qt3DCore::QNodeId criterionId)
 {
     m_filters.removeOne(criterionId);
 }
diff --git a/src/render/framegraph/techniquefilternode_p.h b/src/render/framegraph/techniquefilternode_p.h
index 7d15f8007..e88762e3d 100644
--- a/src/render/framegraph/techniquefilternode_p.h
+++ b/src/render/framegraph/techniquefilternode_p.h
@@ -83,8 +83,8 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
-    void appendFilter(const Qt3DCore::QNodeId &criterionId);
-    void removeFilter(const Qt3DCore::QNodeId &criterionId);
+    void appendFilter(Qt3DCore::QNodeId criterionId);
+    void removeFilter(Qt3DCore::QNodeId criterionId);
 
     QList<Qt3DCore::QNodeId> m_filters;
     ParameterPack m_parameterPack;
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index ef8d6cd2a..9f8f3b423 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -346,7 +346,7 @@ QVector<Qt3DCore::QAspectJobPtr> QRenderAspect::jobsToExecute(qint64 time)
         d->m_cleanupJob->setRoot(d->m_renderer->sceneRoot());
 
         const QVector<QNodeId> texturesPending = manager->textureDataManager()->texturesPending();
-        Q_FOREACH (const QNodeId &textureId, texturesPending) {
+        Q_FOREACH (QNodeId textureId, texturesPending) {
             Render::LoadTextureDataJobPtr loadTextureJob(new Render::LoadTextureDataJob(textureId));
             loadTextureJob->setNodeManagers(manager);
             jobs.append(loadTextureJob);
@@ -460,7 +460,7 @@ QVector<Qt3DCore::QAspectJobPtr> QRenderAspect::createRenderBufferJobs()
     const QVector<QNodeId> dirtyBuffers = d->m_nodeManagers->bufferManager()->dirtyBuffers();
     QVector<QAspectJobPtr> dirtyBuffersJobs;
 
-    Q_FOREACH (const QNodeId &bufId, dirtyBuffers) {
+    Q_FOREACH (QNodeId bufId, dirtyBuffers) {
         Render::HBuffer bufferHandle = d->m_nodeManagers->lookupHandle<Render::Buffer, Render::BufferManager, Render::HBuffer>(bufId);
         if (!bufferHandle.isNull()) {
             // Create new buffer job
@@ -480,7 +480,7 @@ QVector<Qt3DCore::QAspectJobPtr> QRenderAspect::createGeometryRendererJobs()
     const QVector<QNodeId> dirtyGeometryRenderers = geomRendererManager->dirtyGeometryRenderers();
     QVector<QAspectJobPtr> dirtyGeometryRendererJobs;
 
-    Q_FOREACH (const QNodeId &geoRendererId, dirtyGeometryRenderers) {
+    Q_FOREACH (QNodeId geoRendererId, dirtyGeometryRenderers) {
         Render::HGeometryRenderer geometryRendererHandle = geomRendererManager->lookupHandle(geoRendererId);
         if (!geometryRendererHandle.isNull()) {
             Render::LoadGeometryJobPtr job(new Render::LoadGeometryJob(geometryRendererHandle));
diff --git a/src/render/frontend/sphere_p.h b/src/render/frontend/sphere_p.h
index 5b74d1dc9..72be54ca7 100644
--- a/src/render/frontend/sphere_p.h
+++ b/src/render/frontend/sphere_p.h
@@ -67,13 +67,13 @@ namespace Render {
 class QT3DRENDERSHARED_PRIVATE_EXPORT Sphere : public QBoundingSphere
 {
 public:
-    inline Sphere(const Qt3DCore::QNodeId &i = Qt3DCore::QNodeId())
+    inline Sphere(Qt3DCore::QNodeId i = Qt3DCore::QNodeId())
         : m_center()
         , m_radius(0.0f)
         , m_id(i)
     {}
 
-    inline Sphere(const QVector3D &c, float r, const Qt3DCore::QNodeId &i = Qt3DCore::QNodeId())
+    inline Sphere(const QVector3D &c, float r, Qt3DCore::QNodeId i = Qt3DCore::QNodeId())
         : m_center(c)
         , m_radius(r)
         , m_id(i)
diff --git a/src/render/geometry/buffer.cpp b/src/render/geometry/buffer.cpp
index 16772515e..108470947 100644
--- a/src/render/geometry/buffer.cpp
+++ b/src/render/geometry/buffer.cpp
@@ -157,12 +157,12 @@ Qt3DCore::QBackendNode *BufferFunctor::create(Qt3DCore::QNode *frontend) const
     return buffer;
 }
 
-Qt3DCore::QBackendNode *BufferFunctor::get(const Qt3DCore::QNodeId &id) const
+Qt3DCore::QBackendNode *BufferFunctor::get(Qt3DCore::QNodeId id) const
 {
     return m_manager->lookupResource(id);
 }
 
-void BufferFunctor::destroy(const Qt3DCore::QNodeId &id) const
+void BufferFunctor::destroy(Qt3DCore::QNodeId id) const
 {
     return m_manager->releaseResource(id);
 }
diff --git a/src/render/geometry/buffer_p.h b/src/render/geometry/buffer_p.h
index d760afd63..ebaf60ad2 100644
--- a/src/render/geometry/buffer_p.h
+++ b/src/render/geometry/buffer_p.h
@@ -99,8 +99,8 @@ class BufferFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit BufferFunctor(BufferManager *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:
     BufferManager *m_manager;
 };
diff --git a/src/render/geometry/buffermanager.cpp b/src/render/geometry/buffermanager.cpp
index d8aa4518e..af9c83198 100644
--- a/src/render/geometry/buffermanager.cpp
+++ b/src/render/geometry/buffermanager.cpp
@@ -52,7 +52,7 @@ BufferManager::~BufferManager()
 {
 }
 
-void BufferManager::addDirtyBuffer(const Qt3DCore::QNodeId &bufferId)
+void BufferManager::addDirtyBuffer(Qt3DCore::QNodeId bufferId)
 {
     if (!m_dirtyBuffers.contains(bufferId))
         m_dirtyBuffers.push_back(bufferId);
diff --git a/src/render/geometry/buffermanager_p.h b/src/render/geometry/buffermanager_p.h
index 6599fdac2..4851a1ff4 100644
--- a/src/render/geometry/buffermanager_p.h
+++ b/src/render/geometry/buffermanager_p.h
@@ -72,7 +72,7 @@ public:
     ~BufferManager();
 
     // Aspect Thread
-    void addDirtyBuffer(const Qt3DCore::QNodeId &bufferId);
+    void addDirtyBuffer(Qt3DCore::QNodeId bufferId);
     QVector<Qt3DCore::QNodeId> dirtyBuffers();
 
 private:
diff --git a/src/render/geometry/geometryrenderer.cpp b/src/render/geometry/geometryrenderer.cpp
index 5f9a486e5..072fa798b 100644
--- a/src/render/geometry/geometryrenderer.cpp
+++ b/src/render/geometry/geometryrenderer.cpp
@@ -222,12 +222,12 @@ Qt3DCore::QBackendNode *GeometryRendererFunctor::create(Qt3DCore::QNode *fronten
     return geometryRenderer;
 }
 
-Qt3DCore::QBackendNode *GeometryRendererFunctor::get(const Qt3DCore::QNodeId &id) const
+Qt3DCore::QBackendNode *GeometryRendererFunctor::get(Qt3DCore::QNodeId id) const
 {
     return m_manager->lookupResource(id);
 }
 
-void GeometryRendererFunctor::destroy(const Qt3DCore::QNodeId &id) const
+void GeometryRendererFunctor::destroy(Qt3DCore::QNodeId id) const
 {
     return m_manager->releaseResource(id);
 }
diff --git a/src/render/geometry/geometryrenderer_p.h b/src/render/geometry/geometryrenderer_p.h
index d560ecefa..c12449903 100644
--- a/src/render/geometry/geometryrenderer_p.h
+++ b/src/render/geometry/geometryrenderer_p.h
@@ -116,8 +116,8 @@ class GeometryRendererFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit GeometryRendererFunctor(GeometryRendererManager *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:
     GeometryRendererManager *m_manager;
 };
diff --git a/src/render/geometry/geometryrenderermanager.cpp b/src/render/geometry/geometryrenderermanager.cpp
index 1de5908fb..be5cc2487 100644
--- a/src/render/geometry/geometryrenderermanager.cpp
+++ b/src/render/geometry/geometryrenderermanager.cpp
@@ -52,7 +52,7 @@ GeometryRendererManager::~GeometryRendererManager()
 {
 }
 
-void GeometryRendererManager::addDirtyGeometryRenderer(const Qt3DCore::QNodeId &bufferId)
+void GeometryRendererManager::addDirtyGeometryRenderer(Qt3DCore::QNodeId bufferId)
 {
     if (!m_dirtyGeometryRenderers.contains(bufferId))
         m_dirtyGeometryRenderers.push_back(bufferId);
diff --git a/src/render/geometry/geometryrenderermanager_p.h b/src/render/geometry/geometryrenderermanager_p.h
index b450876fe..76c2c605f 100644
--- a/src/render/geometry/geometryrenderermanager_p.h
+++ b/src/render/geometry/geometryrenderermanager_p.h
@@ -72,7 +72,7 @@ public:
     ~GeometryRendererManager();
 
     // Aspect Thread
-    void addDirtyGeometryRenderer(const Qt3DCore::QNodeId &bufferId);
+    void addDirtyGeometryRenderer(Qt3DCore::QNodeId bufferId);
     QVector<Qt3DCore::QNodeId> dirtyGeometryRenderers();
 
     void requestTriangleDataRefreshForGeometryRenderer(const Qt3DCore::QNodeId geometryRenderer);
diff --git a/src/render/io/qsceneloader.cpp b/src/render/io/qsceneloader.cpp
index 71879d7de..4abbebadf 100644
--- a/src/render/io/qsceneloader.cpp
+++ b/src/render/io/qsceneloader.cpp
@@ -75,7 +75,7 @@ void QSceneLoader::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &change)
                 QList<QNodeId> entities = d->m_scene->entitiesForComponent(d->m_id);
                 if (entities.size() > 1) // TO DO: QComponent shareable property
                     qCWarning(Render::Frontend) << "It is strongly discouraged to share SceneLoader component between entities";
-                Q_FOREACH (const QNodeId &id, entities) {
+                Q_FOREACH (QNodeId id, entities) {
                     QEntity *parentEntity = qobject_cast<QEntity *>(d->m_scene->lookupNode(id));
                     if (parentEntity != Q_NULLPTR) {
                         QEntity *cloneScene = qobject_cast<QEntity *>(QNode::clone(scene));
diff --git a/src/render/io/scene.cpp b/src/render/io/scene.cpp
index 19a196fbe..4c1999862 100644
--- a/src/render/io/scene.cpp
+++ b/src/render/io/scene.cpp
@@ -116,12 +116,12 @@ Qt3DCore::QBackendNode *RenderSceneFunctor::create(Qt3DCore::QNode *frontend) co
     return scene;
 }
 
-Qt3DCore::QBackendNode *RenderSceneFunctor::get(const Qt3DCore::QNodeId &id) const
+Qt3DCore::QBackendNode *RenderSceneFunctor::get(Qt3DCore::QNodeId id) const
 {
     return m_sceneManager->lookupResource(id);
 }
 
-void RenderSceneFunctor::destroy(const Qt3DCore::QNodeId &id) const
+void RenderSceneFunctor::destroy(Qt3DCore::QNodeId id) const
 {
     m_sceneManager->releaseResource(id);
 }
diff --git a/src/render/io/scene_p.h b/src/render/io/scene_p.h
index 98f1013dd..caea7912d 100644
--- a/src/render/io/scene_p.h
+++ b/src/render/io/scene_p.h
@@ -89,8 +89,8 @@ class RenderSceneFunctor : public Qt3DCore::QBackendNodeFunctor
 public:
     explicit RenderSceneFunctor(SceneManager *sceneManager);
     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:
     SceneManager *m_sceneManager;
diff --git a/src/render/io/scenemanager.cpp b/src/render/io/scenemanager.cpp
index 988e30eb6..27419e471 100644
--- a/src/render/io/scenemanager.cpp
+++ b/src/render/io/scenemanager.cpp
@@ -52,7 +52,7 @@ SceneManager::SceneManager() : QResourceManager<Scene,
 {
 }
 
-void SceneManager::addSceneData(const QUrl &source, const Qt3DCore::QNodeId &sceneUuid)
+void SceneManager::addSceneData(const QUrl &source, Qt3DCore::QNodeId sceneUuid)
 {
     LoadSceneJobPtr newJob(new LoadSceneJob(source, sceneUuid));
 
diff --git a/src/render/io/scenemanager_p.h b/src/render/io/scenemanager_p.h
index b39ea45dc..27f1da66b 100644
--- a/src/render/io/scenemanager_p.h
+++ b/src/render/io/scenemanager_p.h
@@ -74,7 +74,7 @@ class SceneManager : public Qt3DCore::QResourceManager<Scene,
 public:
     SceneManager();
 
-    void addSceneData(const QUrl &source, const Qt3DCore::QNodeId &sceneUuid);
+    void addSceneData(const QUrl &source, Qt3DCore::QNodeId sceneUuid);
     QVector<LoadSceneJobPtr> pendingSceneLoaderJobs();
 
     void addLoadedSceneTree(const QUrl &source, Qt3DCore::QEntity *tree);
diff --git a/src/render/jobs/loadscenejob.cpp b/src/render/jobs/loadscenejob.cpp
index 933408246..610091953 100644
--- a/src/render/jobs/loadscenejob.cpp
+++ b/src/render/jobs/loadscenejob.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 namespace Render {
 
-LoadSceneJob::LoadSceneJob(const QUrl &source, const Qt3DCore::QNodeId &m_sceneComponent)
+LoadSceneJob::LoadSceneJob(const QUrl &source, Qt3DCore::QNodeId m_sceneComponent)
     : QAspectJob()
     , m_source(source)
     , m_sceneComponent(m_sceneComponent)
diff --git a/src/render/jobs/loadscenejob_p.h b/src/render/jobs/loadscenejob_p.h
index 7483b1bd2..25cd02d83 100644
--- a/src/render/jobs/loadscenejob_p.h
+++ b/src/render/jobs/loadscenejob_p.h
@@ -69,7 +69,7 @@ class NodeManagers;
 class LoadSceneJob : public Qt3DCore::QAspectJob
 {
 public:
-    explicit LoadSceneJob(const QUrl &source, const Qt3DCore::QNodeId &sceneComponent);
+    explicit LoadSceneJob(const QUrl &source, Qt3DCore::QNodeId sceneComponent);
     void setNodeManagers(NodeManagers *managers) { m_managers = managers; }
     void setSceneParsers(const QList<QAbstractSceneParser *> sceneParsers) { m_parsers = sceneParsers; }
 
diff --git a/src/render/jobs/loadtexturedatajob.cpp b/src/render/jobs/loadtexturedatajob.cpp
index 3b104ebdc..3e7f6efac 100644
--- a/src/render/jobs/loadtexturedatajob.cpp
+++ b/src/render/jobs/loadtexturedatajob.cpp
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 namespace Render {
 
-LoadTextureDataJob::LoadTextureDataJob(const Qt3DCore::QNodeId &textureId)
+LoadTextureDataJob::LoadTextureDataJob(Qt3DCore::QNodeId textureId)
     : m_textureId(textureId)
 {
 }
diff --git a/src/render/jobs/loadtexturedatajob_p.h b/src/render/jobs/loadtexturedatajob_p.h
index 5b0e387c0..2f2851239 100644
--- a/src/render/jobs/loadtexturedatajob_p.h
+++ b/src/render/jobs/loadtexturedatajob_p.h
@@ -66,7 +66,7 @@ class NodeManagers;
 class LoadTextureDataJob : public Qt3DCore::QAspectJob
 {
 public:
-    LoadTextureDataJob(const Qt3DCore::QNodeId &textureId);
+    LoadTextureDataJob(Qt3DCore::QNodeId textureId);
     ~LoadTextureDataJob();
     inline void setNodeManagers(NodeManagers *manager) { m_manager = manager; }
 
diff --git a/src/render/jobs/pickboundingvolumejob.cpp b/src/render/jobs/pickboundingvolumejob.cpp
index 6c3ee5e39..1154d46ec 100644
--- a/src/render/jobs/pickboundingvolumejob.cpp
+++ b/src/render/jobs/pickboundingvolumejob.cpp
@@ -443,7 +443,7 @@ void PickBoundingVolumeJob::run()
     m_mouseEvents.clear();
 }
 
-void PickBoundingVolumeJob::viewMatrixForCamera(const Qt3DCore::QNodeId &cameraId,
+void PickBoundingVolumeJob::viewMatrixForCamera(Qt3DCore::QNodeId cameraId,
                                                 QMatrix4x4 &viewMatrix,
                                                 QMatrix4x4 &projectionMatrix) const
 {
@@ -475,7 +475,7 @@ QRect PickBoundingVolumeJob::windowViewport(const QRectF &relativeViewport) cons
 
 Qt3DCore::QRay3D PickBoundingVolumeJob::rayForViewportAndCamera(const QPoint &pos,
                                                                 const QRectF &relativeViewport,
-                                                                const Qt3DCore::QNodeId &cameraId) const
+                                                                Qt3DCore::QNodeId cameraId) const
 {
     QMatrix4x4 viewMatrix;
     QMatrix4x4 projectionMatrix;
diff --git a/src/render/jobs/pickboundingvolumejob_p.h b/src/render/jobs/pickboundingvolumejob_p.h
index fc36072ba..695e8e010 100644
--- a/src/render/jobs/pickboundingvolumejob_p.h
+++ b/src/render/jobs/pickboundingvolumejob_p.h
@@ -95,13 +95,13 @@ private:
     Entity *m_node;
     QList<QMouseEvent> m_mouseEvents;
 
-    void viewMatrixForCamera(const Qt3DCore::QNodeId &cameraId,
+    void viewMatrixForCamera(Qt3DCore::QNodeId cameraId,
                              QMatrix4x4 &viewMatrix,
                              QMatrix4x4 &projectionMatrix) const;
     QRect windowViewport(const QRectF &relativeViewport) const;
     Qt3DCore::QRay3D rayForViewportAndCamera(const QPoint &pos,
                                              const QRectF &relativeViewport,
-                                             const Qt3DCore::QNodeId &cameraId) const;
+                                             Qt3DCore::QNodeId cameraId) const;
     void clearPreviouslyHoveredPickers();
     HObjectPicker m_currentPicker;
     QVector<HObjectPicker> m_hoveredPickers;
diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp
index fd63488cd..315f0bcfd 100644
--- a/src/render/jobs/renderviewjobutils.cpp
+++ b/src/render/jobs/renderviewjobutils.cpp
@@ -141,7 +141,7 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN
                         rv->setDrawBuffers(targetSelector->drawBuffers());
 
                         // Copy attachments
-                        Q_FOREACH (const QNodeId &attachmentId, renderTarget->renderAttachments()) {
+                        Q_FOREACH (QNodeId attachmentId, renderTarget->renderAttachments()) {
                             RenderAttachment *attachment = manager->attachmentManager()->lookupResource(attachmentId);
                             if (attachment)
                                 rv->addRenderAttachment(attachment->attachment());
@@ -281,11 +281,11 @@ Technique *findTechniqueForEffect(Renderer *renderer,
 
             // Iterate through the filter criteria and for each one search for a criteria on the
             // technique that satisfies it
-            Q_FOREACH (const QNodeId &filterAnnotationId, techniqueFilter->filters()) {
+            Q_FOREACH (QNodeId filterAnnotationId, techniqueFilter->filters()) {
                 foundMatch = false;
                 Annotation *filterAnnotation = manager->criterionManager()->lookupResource(filterAnnotationId);
 
-                Q_FOREACH (const QNodeId &techniqueAnnotationId, technique->annotations()) {
+                Q_FOREACH (QNodeId techniqueAnnotationId, technique->annotations()) {
                     Annotation *techniqueAnnotation = manager->criterionManager()->lookupResource(techniqueAnnotationId);
                     if ((foundMatch = (*techniqueAnnotation == *filterAnnotation)))
                         break;
@@ -316,7 +316,7 @@ RenderRenderPassList findRenderPassesForTechnique(NodeManagers *manager,
     Q_ASSERT(technique);
 
     RenderRenderPassList passes;
-    Q_FOREACH (const QNodeId &passId, technique->renderPasses()) {
+    Q_FOREACH (QNodeId passId, technique->renderPasses()) {
         RenderPass *renderPass = manager->renderPassManager()->lookupResource(passId);
 
         if (renderPass) {
@@ -327,11 +327,11 @@ RenderRenderPassList findRenderPassesForTechnique(NodeManagers *manager,
             if (!foundMatch && renderPass->annotations().size() >= passFilter->filters().size()) {
 
                 // Iterate through the filter criteria and look for render passes with criteria that satisfy them
-                Q_FOREACH (const QNodeId &filterAnnotationId, passFilter->filters()) {
+                Q_FOREACH (QNodeId filterAnnotationId, passFilter->filters()) {
                     foundMatch = false;
                     Annotation *filterAnnotation = manager->criterionManager()->lookupResource(filterAnnotationId);
 
-                    Q_FOREACH (const QNodeId &passAnnotationId, renderPass->annotations()) {
+                    Q_FOREACH (QNodeId passAnnotationId, renderPass->annotations()) {
                         Annotation *passAnnotation = manager->criterionManager()->lookupResource(passAnnotationId);
                         if ((foundMatch = (*passAnnotation == *filterAnnotation)))
                             break;
diff --git a/src/render/lights/light.cpp b/src/render/lights/light.cpp
index 36db98c93..3d8e6615b 100644
--- a/src/render/lights/light.cpp
+++ b/src/render/lights/light.cpp
@@ -65,12 +65,12 @@ Qt3DCore::QBackendNode *RenderLightFunctor::create(Qt3DCore::QNode *frontend) co
     return backend;
 }
 
-Qt3DCore::QBackendNode *RenderLightFunctor::get(const Qt3DCore::QNodeId &id) const
+Qt3DCore::QBackendNode *RenderLightFunctor::get(Qt3DCore::QNodeId id) const
 {
     return m_managers->lightManager()->lookupResource(id);
 }
 
-void RenderLightFunctor::destroy(const Qt3DCore::QNodeId &id) const
+void RenderLightFunctor::destroy(Qt3DCore::QNodeId id) const
 {
     m_managers->lightManager()->releaseResource(id);
 }
diff --git a/src/render/lights/light_p.h b/src/render/lights/light_p.h
index 4ab89a4a7..4012bbddc 100644
--- a/src/render/lights/light_p.h
+++ b/src/render/lights/light_p.h
@@ -73,8 +73,8 @@ public:
     explicit RenderLightFunctor(NodeManagers *managers);
 
     Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL;
-    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
-    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
+    void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
 
 private:
     NodeManagers *m_managers;
diff --git a/src/render/materialsystem/effect.cpp b/src/render/materialsystem/effect.cpp
index fdf7df016..262aa6484 100644
--- a/src/render/materialsystem/effect.cpp
+++ b/src/render/materialsystem/effect.cpp
@@ -106,7 +106,7 @@ void Effect::sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e)
     }
 }
 
-void Effect::appendRenderTechnique(const Qt3DCore::QNodeId &technique)
+void Effect::appendRenderTechnique(Qt3DCore::QNodeId technique)
 {
     if (!m_techniques.contains(technique))
         m_techniques.append(technique);
diff --git a/src/render/materialsystem/effect_p.h b/src/render/materialsystem/effect_p.h
index f7e21adcc..39cf98932 100644
--- a/src/render/materialsystem/effect_p.h
+++ b/src/render/materialsystem/effect_p.h
@@ -74,7 +74,7 @@ public:
 
     void updateFromPeer(Qt3DCore::QNode *peer) Q_DECL_OVERRIDE;
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void appendRenderTechnique(const Qt3DCore::QNodeId &t);
+    void appendRenderTechnique(Qt3DCore::QNodeId t);
 
     QList<Qt3DCore::QNodeId> techniques() const;
     QList<Qt3DCore::QNodeId> parameters() const;
diff --git a/src/render/materialsystem/renderpass.cpp b/src/render/materialsystem/renderpass.cpp
index 91b6789a5..85e71995b 100644
--- a/src/render/materialsystem/renderpass.cpp
+++ b/src/render/materialsystem/renderpass.cpp
@@ -151,13 +151,13 @@ QList<Qt3DCore::QNodeId> RenderPass::parameters() const
     return m_parameterPack.parameters();
 }
 
-void RenderPass::appendAnnotation(const Qt3DCore::QNodeId &annotationId)
+void RenderPass::appendAnnotation(Qt3DCore::QNodeId annotationId)
 {
     if (!m_annotationList.contains(annotationId))
         m_annotationList.append(annotationId);
 }
 
-void RenderPass::removeAnnotation(const Qt3DCore::QNodeId &annotationId)
+void RenderPass::removeAnnotation(Qt3DCore::QNodeId annotationId)
 {
     m_annotationList.removeOne(annotationId);
 }
@@ -168,7 +168,7 @@ void RenderPass::appendBinding(const ParameterMapping &binding)
         m_bindings[binding.id()] = binding;
 }
 
-void RenderPass::removeBinding(const Qt3DCore::QNodeId &bindingId)
+void RenderPass::removeBinding(Qt3DCore::QNodeId bindingId)
 {
     m_bindings.remove(bindingId);
 }
diff --git a/src/render/materialsystem/renderpass_p.h b/src/render/materialsystem/renderpass_p.h
index be038e97d..0adf68c17 100644
--- a/src/render/materialsystem/renderpass_p.h
+++ b/src/render/materialsystem/renderpass_p.h
@@ -92,11 +92,11 @@ public:
     QList<Qt3DCore::QNodeId> parameters() const;
 
 private:
-    void appendAnnotation(const Qt3DCore::QNodeId &criterionId);
-    void removeAnnotation(const Qt3DCore::QNodeId &criterionId);
+    void appendAnnotation(Qt3DCore::QNodeId criterionId);
+    void removeAnnotation(Qt3DCore::QNodeId criterionId);
 
     void appendBinding(const ParameterMapping &binding);
-    void removeBinding(const Qt3DCore::QNodeId &bindingId);
+    void removeBinding(Qt3DCore::QNodeId bindingId);
 
     Qt3DCore::QNodeId m_shaderUuid;
     QHash<Qt3DCore::QNodeId, ParameterMapping> m_bindings;
diff --git a/src/render/materialsystem/shaderdata.cpp b/src/render/materialsystem/shaderdata.cpp
index 21232b3bc..b4a226221 100644
--- a/src/render/materialsystem/shaderdata.cpp
+++ b/src/render/materialsystem/shaderdata.cpp
@@ -79,7 +79,7 @@ void ShaderData::setManagers(NodeManagers *managers)
     m_managers = managers;
 }
 
-ShaderData *ShaderData::lookupResource(NodeManagers *managers, const QNodeId &id)
+ShaderData *ShaderData::lookupResource(NodeManagers *managers, QNodeId id)
 {
     ShaderData *shaderData = managers->shaderDataManager()->lookupResource(id);
     if (!shaderData)
@@ -88,7 +88,7 @@ ShaderData *ShaderData::lookupResource(NodeManagers *managers, const QNodeId &id
     return shaderData;
 }
 
-ShaderData *ShaderData::lookupResource(const QNodeId &id)
+ShaderData *ShaderData::lookupResource(QNodeId id)
 {
     return ShaderData::lookupResource(m_managers, id);
 }
@@ -127,7 +127,7 @@ void ShaderData::clearUpdatedProperties()
 
 void ShaderData::cleanup(NodeManagers *managers)
 {
-    Q_FOREACH (const Qt3DCore::QNodeId &id, m_updatedShaderData) {
+    Q_FOREACH (Qt3DCore::QNodeId id, m_updatedShaderData) {
         ShaderData *shaderData = ShaderData::lookupResource(managers, id);
         if (shaderData)
             shaderData->clearUpdatedProperties();
@@ -338,12 +338,12 @@ Qt3DCore::QBackendNode *RenderShaderDataFunctor::create(Qt3DCore::QNode *fronten
     return backend;
 }
 
-Qt3DCore::QBackendNode *RenderShaderDataFunctor::get(const Qt3DCore::QNodeId &id) const
+Qt3DCore::QBackendNode *RenderShaderDataFunctor::get(Qt3DCore::QNodeId id) const
 {
     return m_managers->shaderDataManager()->lookupResource(id);
 }
 
-void RenderShaderDataFunctor::destroy(const Qt3DCore::QNodeId &id) const
+void RenderShaderDataFunctor::destroy(Qt3DCore::QNodeId id) const
 {
     m_managers->shaderDataManager()->releaseResource(id);
 }
diff --git a/src/render/materialsystem/shaderdata_p.h b/src/render/materialsystem/shaderdata_p.h
index 60b082c9f..724bf6c32 100644
--- a/src/render/materialsystem/shaderdata_p.h
+++ b/src/render/materialsystem/shaderdata_p.h
@@ -111,8 +111,8 @@ protected:
 
     void readPeerProperties(QShaderData *peer);
     void clearUpdatedProperties();
-    static ShaderData *lookupResource(NodeManagers *managers, const Qt3DCore::QNodeId &id);
-    ShaderData *lookupResource(const Qt3DCore::QNodeId &id);
+    static ShaderData *lookupResource(NodeManagers *managers, Qt3DCore::QNodeId id);
+    ShaderData *lookupResource(Qt3DCore::QNodeId id);
 
     friend class RenderShaderDataFunctor;
 };
@@ -123,8 +123,8 @@ public:
     explicit RenderShaderDataFunctor(NodeManagers *managers);
 
     Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL;
-    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
-    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
+    void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
 
 private:
     NodeManagers *m_managers;
diff --git a/src/render/materialsystem/technique.cpp b/src/render/materialsystem/technique.cpp
index 6f6b3b759..a464e68d6 100644
--- a/src/render/materialsystem/technique.cpp
+++ b/src/render/materialsystem/technique.cpp
@@ -156,13 +156,13 @@ QList<Qt3DCore::QNodeId> Technique::parameters() const
     return m_parameterPack.parameters();
 }
 
-void Technique::appendRenderPass(const Qt3DCore::QNodeId &renderPassId)
+void Technique::appendRenderPass(Qt3DCore::QNodeId renderPassId)
 {
     if (!m_renderPasses.contains(renderPassId))
         m_renderPasses.append(renderPassId);
 }
 
-void Technique::removeRenderPass(const Qt3DCore::QNodeId &renderPassId)
+void Technique::removeRenderPass(Qt3DCore::QNodeId renderPassId)
 {
     m_renderPasses.removeOne(renderPassId);
 }
@@ -182,13 +182,13 @@ QGraphicsApiFilter *Technique::graphicsApiFilter() const
     return m_graphicsApiFilter;
 }
 
-void Technique::appendAnnotation(const Qt3DCore::QNodeId &criterionId)
+void Technique::appendAnnotation(Qt3DCore::QNodeId criterionId)
 {
     if (!m_annotationList.contains(criterionId))
         m_annotationList.append(criterionId);
 }
 
-void Technique::removeAnnotation(const Qt3DCore::QNodeId &criterionId)
+void Technique::removeAnnotation(Qt3DCore::QNodeId criterionId)
 {
     m_annotationList.removeOne(criterionId);
 }
diff --git a/src/render/materialsystem/technique_p.h b/src/render/materialsystem/technique_p.h
index 7768895a0..3cfcdd3f7 100644
--- a/src/render/materialsystem/technique_p.h
+++ b/src/render/materialsystem/technique_p.h
@@ -84,11 +84,11 @@ public:
     void sceneChangeEvent(const Qt3DCore::QSceneChangePtr &e) Q_DECL_OVERRIDE;
     QList<Qt3DCore::QNodeId> parameters() const;
 
-    void appendRenderPass(const Qt3DCore::QNodeId &renderPassId);
-    void removeRenderPass(const Qt3DCore::QNodeId &renderPassId);
+    void appendRenderPass(Qt3DCore::QNodeId renderPassId);
+    void removeRenderPass(Qt3DCore::QNodeId renderPassId);
 
-    void appendAnnotation(const Qt3DCore::QNodeId &criterionId);
-    void removeAnnotation(const Qt3DCore::QNodeId &criterionId);
+    void appendAnnotation(Qt3DCore::QNodeId criterionId);
+    void removeAnnotation(Qt3DCore::QNodeId criterionId);
 
     QList<Qt3DCore::QNodeId> annotations() const;
     QList<Qt3DCore::QNodeId> renderPasses() const;
diff --git a/src/render/raycasting/qabstractcollisionqueryservice.cpp b/src/render/raycasting/qabstractcollisionqueryservice.cpp
index 2f48d6540..4c59b6aab 100644
--- a/src/render/raycasting/qabstractcollisionqueryservice.cpp
+++ b/src/render/raycasting/qabstractcollisionqueryservice.cpp
@@ -60,7 +60,7 @@ void QAbstractCollisionQueryService::setResultHandle(QCollisionQueryResult &resu
     result.d_func()->setHandle(handle);
 }
 
-void QAbstractCollisionQueryService::addEntityHit(QCollisionQueryResult &result, const Qt3DCore::QNodeId &entity, const QVector3D& intersection, float distance)
+void QAbstractCollisionQueryService::addEntityHit(QCollisionQueryResult &result, Qt3DCore::QNodeId entity, const QVector3D& intersection, float distance)
 {
     result.d_func()->addEntityHit(entity, intersection, distance);
 }
diff --git a/src/render/raycasting/qabstractcollisionqueryservice_p.h b/src/render/raycasting/qabstractcollisionqueryservice_p.h
index e0b278299..9121ab019 100644
--- a/src/render/raycasting/qabstractcollisionqueryservice_p.h
+++ b/src/render/raycasting/qabstractcollisionqueryservice_p.h
@@ -98,7 +98,7 @@ protected:
     QAbstractCollisionQueryService(QAbstractCollisionQueryServicePrivate &dd);
 
     void setResultHandle(QCollisionQueryResult &result, const QQueryHandle &handle);
-    void addEntityHit(QCollisionQueryResult &result, const Qt3DCore::QNodeId &entity, const QVector3D &intersection, float distance);
+    void addEntityHit(QCollisionQueryResult &result, Qt3DCore::QNodeId entity, const QVector3D &intersection, float distance);
 
 private:
     Q_DECLARE_PRIVATE(QAbstractCollisionQueryService)
diff --git a/src/render/raycasting/qcollisionqueryresult.cpp b/src/render/raycasting/qcollisionqueryresult.cpp
index c264d493d..e1416dc29 100644
--- a/src/render/raycasting/qcollisionqueryresult.cpp
+++ b/src/render/raycasting/qcollisionqueryresult.cpp
@@ -55,7 +55,7 @@ QCollisionQueryResultPrivate::QCollisionQueryResultPrivate(const QCollisionQuery
 {
 }
 
-void QCollisionQueryResultPrivate::addEntityHit(const Qt3DCore::QNodeId &entity, const QVector3D& intersection, float distance)
+void QCollisionQueryResultPrivate::addEntityHit(Qt3DCore::QNodeId entity, const QVector3D& intersection, float distance)
 {
     m_hits.append(QCollisionQueryResult::Hit(entity, intersection, distance));
 }
diff --git a/src/render/raycasting/qcollisionqueryresult_p.h b/src/render/raycasting/qcollisionqueryresult_p.h
index 0c455b6b8..ab71e7920 100644
--- a/src/render/raycasting/qcollisionqueryresult_p.h
+++ b/src/render/raycasting/qcollisionqueryresult_p.h
@@ -69,7 +69,7 @@ class QT3DRENDERSHARED_EXPORT QCollisionQueryResult
 public:
     struct Hit {
         Hit() : m_distance(-1.f) { }
-        Hit(const Qt3DCore::QNodeId &entity, const QVector3D &intersection, float distance) : m_entityId(entity), m_intersection(intersection), m_distance(distance) { }
+        Hit(Qt3DCore::QNodeId entity, const QVector3D &intersection, float distance) : m_entityId(entity), m_intersection(intersection), m_distance(distance) { }
         Qt3DCore::QNodeId m_entityId;
         QVector3D m_intersection;
         float m_distance;
@@ -120,7 +120,7 @@ public:
     explicit QCollisionQueryResultPrivate(const QCollisionQueryResultPrivate &copy);
 
     void setHandle(const QQueryHandle &handle);
-    void addEntityHit(const Qt3DCore::QNodeId &entity, const QVector3D& intersection, float distance);
+    void addEntityHit(Qt3DCore::QNodeId entity, const QVector3D& intersection, float distance);
 
     QQueryHandle m_handle;
     QVector<QCollisionQueryResult::Hit> m_hits;
diff --git a/src/render/renderstates/renderstatecollection.cpp b/src/render/renderstates/renderstatecollection.cpp
index f7228fd1e..d7659285b 100644
--- a/src/render/renderstates/renderstatecollection.cpp
+++ b/src/render/renderstates/renderstatecollection.cpp
@@ -74,7 +74,7 @@ bool RenderStateCollection::hasRenderStates() const
     return !m_renderStateIds.empty();
 }
 
-void RenderStateCollection::appendRenderState(const Qt3DCore::QNodeId &renderStateId)
+void RenderStateCollection::appendRenderState(Qt3DCore::QNodeId renderStateId)
 {
     if (!m_renderStateIds.contains(renderStateId)) {
         m_renderStateIds.append(renderStateId);
@@ -82,7 +82,7 @@ void RenderStateCollection::appendRenderState(const Qt3DCore::QNodeId &renderSta
     }
 }
 
-void RenderStateCollection::removeRenderState(const Qt3DCore::QNodeId &renderStateId)
+void RenderStateCollection::removeRenderState(Qt3DCore::QNodeId renderStateId)
 {
     if (m_renderStateIds.removeAll(renderStateId) > 0) {
         m_dirty = true;
diff --git a/src/render/renderstates/renderstatecollection_p.h b/src/render/renderstates/renderstatecollection_p.h
index 4e6c7502f..060f0011f 100644
--- a/src/render/renderstates/renderstatecollection_p.h
+++ b/src/render/renderstates/renderstatecollection_p.h
@@ -70,8 +70,8 @@ public:
     bool hasRenderStates() const;
 
 protected:
-    void appendRenderState(const Qt3DCore::QNodeId &renderStateId);
-    void removeRenderState(const Qt3DCore::QNodeId &renderStateId);
+    void appendRenderState(Qt3DCore::QNodeId renderStateId);
+    void removeRenderState(Qt3DCore::QNodeId renderStateId);
 
 private:
     QVector<Qt3DCore::QNodeId> m_renderStateIds;
diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp
index 2006c4e6c..cb75b102e 100644
--- a/src/render/texture/texture.cpp
+++ b/src/render/texture/texture.cpp
@@ -692,12 +692,12 @@ Qt3DCore::QBackendNode *TextureFunctor::create(Qt3DCore::QNode *frontend) const
     return backend;
 }
 
-Qt3DCore::QBackendNode *TextureFunctor::get(const Qt3DCore::QNodeId &id) const
+Qt3DCore::QBackendNode *TextureFunctor::get(Qt3DCore::QNodeId id) const
 {
     return m_textureManager->lookupResource(id);
 }
 
-void TextureFunctor::destroy(const Qt3DCore::QNodeId &id) const
+void TextureFunctor::destroy(Qt3DCore::QNodeId id) const
 {
     m_textureManager->releaseResource(id);
 }
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h
index d9ea1ecfb..38ce82d0b 100644
--- a/src/render/texture/texture_p.h
+++ b/src/render/texture/texture_p.h
@@ -169,8 +169,8 @@ public:
                                   TextureDataManager *textureDataManager);
 
     Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL;
-    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
-    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
+    void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
 
 private:
     TextureManager *m_textureManager;
diff --git a/src/render/texture/texturedatamanager.cpp b/src/render/texture/texturedatamanager.cpp
index 76f939fee..4f4e6e877 100644
--- a/src/render/texture/texturedatamanager.cpp
+++ b/src/render/texture/texturedatamanager.cpp
@@ -51,7 +51,7 @@ TextureDataManager::TextureDataManager()
 {}
 
 // Called from AspectThread sync
-void TextureDataManager::addToPendingTextures(const Qt3DCore::QNodeId &textureId)
+void TextureDataManager::addToPendingTextures(Qt3DCore::QNodeId textureId)
 {
     // This simple check ensures that we won't be having n jobs
     // for one mesh, in case n Materials are referencing the said
diff --git a/src/render/texture/texturedatamanager_p.h b/src/render/texture/texturedatamanager_p.h
index 2cd5022d5..8e151d50d 100644
--- a/src/render/texture/texturedatamanager_p.h
+++ b/src/render/texture/texturedatamanager_p.h
@@ -76,7 +76,7 @@ class TextureDataManager : public Qt3DCore::QResourceManager<QTexImageData,
 {
 public:
     TextureDataManager();
-    void addToPendingTextures(const Qt3DCore::QNodeId &textureId);
+    void addToPendingTextures(Qt3DCore::QNodeId textureId);
 
     QVector<Qt3DCore::QNodeId> texturesPending();
 
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp
index c607025d0..8a500e9c5 100644
--- a/src/render/texture/textureimage.cpp
+++ b/src/render/texture/textureimage.cpp
@@ -177,12 +177,12 @@ Qt3DCore::QBackendNode *TextureImageFunctor::create(Qt3DCore::QNode *frontend) c
     return backend;
 }
 
-Qt3DCore::QBackendNode *TextureImageFunctor::get(const Qt3DCore::QNodeId &id) const
+Qt3DCore::QBackendNode *TextureImageFunctor::get(Qt3DCore::QNodeId id) const
 {
     return m_textureImageManager->lookupResource(id);
 }
 
-void TextureImageFunctor::destroy(const Qt3DCore::QNodeId &id) const
+void TextureImageFunctor::destroy(Qt3DCore::QNodeId id) const
 {
     m_textureImageManager->releaseResource(id);
 }
diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h
index b4ab2f432..01b0daffa 100644
--- a/src/render/texture/textureimage_p.h
+++ b/src/render/texture/textureimage_p.h
@@ -122,8 +122,8 @@ public:
                                   TextureDataManager *textureDataManager);
 
     Qt3DCore::QBackendNode *create(Qt3DCore::QNode *frontend) const Q_DECL_FINAL;
-    Qt3DCore::QBackendNode *get(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
-    void destroy(const Qt3DCore::QNodeId &id) const Q_DECL_FINAL;
+    Qt3DCore::QBackendNode *get(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
+    void destroy(Qt3DCore::QNodeId id) const Q_DECL_FINAL;
 
 private:
     TextureManager *m_textureManager;