diff options
| author | Volker Krause <volker.krause@kdab.com> | 2016-03-05 13:12:34 +0100 |
|---|---|---|
| committer | Volker Krause <volker.krause@kdab.com> | 2016-03-05 15:33:35 +0000 |
| commit | 6c0eecafa10ea3d8ff288d262bd0368bdf19a9c8 (patch) | |
| tree | b7ff883d7d0a9a919864e98e1b432e361b02705b | |
| parent | 972ea48c1b71cefd60284a3e129d67332e08c058 (diff) | |
Don't detach temporary containers.
Found by clazy.
Change-Id: I4f7dff86a7bbeb539f521877f64219eaba132aae
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
| -rw-r--r-- | src/render/backend/renderer.cpp | 8 | ||||
| -rw-r--r-- | src/render/frontend/qboundingvolumedebug.cpp | 4 |
2 files changed, 6 insertions, 6 deletions
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp index eea21acd7..4657382e3 100644 --- a/src/render/backend/renderer.cpp +++ b/src/render/backend/renderer.cpp @@ -415,8 +415,8 @@ void Renderer::setSceneRoot(QBackendNodeFactory *factory, Entity *sgRoot) factory->createBackendNode(m_defaultMaterial); factory->createBackendNode(m_defaultMaterial->effect()); factory->createBackendNode(m_defaultTechnique); - factory->createBackendNode(m_defaultTechnique->renderPasses().first()); - factory->createBackendNode(m_defaultTechnique->renderPasses().first()->shaderProgram()); + factory->createBackendNode(m_defaultTechnique->renderPasses().constFirst()); + factory->createBackendNode(m_defaultTechnique->renderPasses().constFirst()->shaderProgram()); // We create backend resources for all the parameters Q_FOREACH (QParameter *p, m_defaultMaterial->parameters()) @@ -429,8 +429,8 @@ void Renderer::setSceneRoot(QBackendNodeFactory *factory, Entity *sgRoot) m_defaultMaterialHandle = nodeManagers()->lookupHandle<Material, MaterialManager, HMaterial>(m_defaultMaterial->id()); m_defaultEffectHandle = nodeManagers()->lookupHandle<Effect, EffectManager, HEffect>(m_defaultMaterial->effect()->id()); m_defaultTechniqueHandle = nodeManagers()->lookupHandle<Technique, TechniqueManager, HTechnique>(m_defaultTechnique->id()); - m_defaultRenderPassHandle = nodeManagers()->lookupHandle<RenderPass, RenderPassManager, HRenderPass>(m_defaultTechnique->renderPasses().first()->id()); - m_defaultRenderShader = nodeManagers()->lookupResource<Shader, ShaderManager>(m_defaultTechnique->renderPasses().first()->shaderProgram()->id()); + m_defaultRenderPassHandle = nodeManagers()->lookupHandle<RenderPass, RenderPassManager, HRenderPass>(m_defaultTechnique->renderPasses().constFirst()->id()); + m_defaultRenderShader = nodeManagers()->lookupResource<Shader, ShaderManager>(m_defaultTechnique->renderPasses().constFirst()->shaderProgram()->id()); } void Renderer::registerEventFilter(QEventFilterService *service) diff --git a/src/render/frontend/qboundingvolumedebug.cpp b/src/render/frontend/qboundingvolumedebug.cpp index 835d1f896..ef3191b4a 100644 --- a/src/render/frontend/qboundingvolumedebug.cpp +++ b/src/render/frontend/qboundingvolumedebug.cpp @@ -171,8 +171,8 @@ void QBoundingVolumeDebugPrivate::updateSubtree() // Insert into scene if (q->entities().size() > 0) { - Qt3DCore::QEntity *rootEntity = findRootEntity(q->entities().first()); - m_debugSubtree->setParent(rootEntity ? rootEntity : q->entities().first()); + Qt3DCore::QEntity *rootEntity = findRootEntity(q->entities().constFirst()); + m_debugSubtree->setParent(rootEntity ? rootEntity : q->entities().constFirst()); } } else { // Just update the mesh |