Entity: use QVector for componentsHandle/renderComponents

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

1 files changed, 12 insertions, 20 deletions

diff --git a/src/render/backend/entity.cpp b/src/render/backend/entity.cpp
index 7ad33d184..1eec44f7b 100644
--- a/src/render/backend/entity.cpp
+++ b/src/render/backend/entity.cpp
@@ -249,14 +249,6 @@ void Entity::appendChildHandle(HEntity childHandle)
     }
 }
 
-void Entity::removeChildHandle(HEntity childHandle)
-{
-    // TO DO : Check if a QList here wouldn't be more performant
-    if (m_childrenHandles.contains(childHandle)) {
-        m_childrenHandles.removeAt(m_childrenHandles.indexOf(childHandle));
-    }
-}
-
 QVector<Entity *> Entity::children() const
 {
     QVector<Entity *> childrenVector;
@@ -408,9 +400,9 @@ HObjectPicker Entity::componentHandle<ObjectPicker>() const
 }
 
 template<>
-QList<HLayer> Entity::componentsHandle<Layer>() const
+QVector<HLayer> Entity::componentsHandle<Layer>() const
 {
-    QList<HLayer> layerHandles;
+    QVector<HLayer> layerHandles;
     layerHandles.reserve(m_layerComponents.size());
     for (QNodeId id : m_layerComponents)
         layerHandles.append(m_nodeManagers->layerManager()->lookupHandle(id));
@@ -418,9 +410,9 @@ QList<HLayer> Entity::componentsHandle<Layer>() const
 }
 
 template<>
-QList<HShaderData> Entity::componentsHandle<ShaderData>() const
+QVector<HShaderData> Entity::componentsHandle<ShaderData>() const
 {
-    QList<HShaderData> shaderDataHandles;
+    QVector<HShaderData> shaderDataHandles;
     shaderDataHandles.reserve(m_shaderDataComponents.size());
     for (QNodeId id : m_shaderDataComponents)
         shaderDataHandles.append(m_nodeManagers->shaderDataManager()->lookupHandle(id));
@@ -434,9 +426,9 @@ QList<HShaderData> Entity::componentsHandle<ShaderData>() const
 //}
 
 template<>
-QList<HLight> Entity::componentsHandle<Light>() const
+QVector<HLight> Entity::componentsHandle<Light>() const
 {
-    QList<HLight> lightHandles;
+    QVector<HLight> lightHandles;
     lightHandles.reserve(m_lightComponents.size());
     for (QNodeId id : m_lightComponents)
         lightHandles.append(m_nodeManagers->lightManager()->lookupHandle(id));
@@ -482,9 +474,9 @@ ObjectPicker *Entity::renderComponent<ObjectPicker>() const
 }
 
 template<>
-QList<Layer *> Entity::renderComponents<Layer>() const
+QVector<Layer *> Entity::renderComponents<Layer>() const
 {
-    QList<Layer *> layers;
+    QVector<Layer *> layers;
     layers.reserve(m_layerComponents.size());
     for (QNodeId id : m_layerComponents)
         layers.append(m_nodeManagers->layerManager()->lookupResource(id));
@@ -492,9 +484,9 @@ QList<Layer *> Entity::renderComponents<Layer>() const
 }
 
 template<>
-QList<ShaderData *> Entity::renderComponents<ShaderData>() const
+QVector<ShaderData *> Entity::renderComponents<ShaderData>() const
 {
-    QList<ShaderData *> shaderDatas;
+    QVector<ShaderData *> shaderDatas;
     shaderDatas.reserve(m_shaderDataComponents.size());
     for (QNodeId id : m_shaderDataComponents)
         shaderDatas.append(m_nodeManagers->shaderDataManager()->lookupResource(id));
@@ -502,9 +494,9 @@ QList<ShaderData *> Entity::renderComponents<ShaderData>() const
 }
 
 template<>
-QList<Light *> Entity::renderComponents<Light>() const
+QVector<Light *> Entity::renderComponents<Light>() const
 {
-    QList<Light *> lights;
+    QVector<Light *> lights;
     lights.reserve(m_lightComponents.size());
     for (QNodeId id : m_lightComponents)
         lights.append(m_nodeManagers->lightManager()->lookupResource(id));