summaryrefslogtreecommitdiffstats
path: root/src/render/backend/managers_p.h
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2015-09-13 18:44:52 +0100
committerSean Harmer <sean.harmer@kdab.com>2015-10-13 08:55:25 +0000
commitbb13c17a362ed0c59e64424f586cf8b5241a1b07 (patch)
tree75fe90cc44f187e32544cc02dafc85d51be1e5f1 /src/render/backend/managers_p.h
parentb11095c58eca857dd8cc0b9ffcf0e4e6d6b5d555 (diff)
Rename RenderEntity -> Entity
Change-Id: Ifb5f3882e9bd584536321dde97eac2c471528f27 Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/backend/managers_p.h')
-rw-r--r--src/render/backend/managers_p.h6
1 files changed, 3 insertions, 3 deletions
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index f7c9b38be..6fdb0d8b9 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -42,7 +42,7 @@
#include <Qt3DRenderer/private/cameralens_p.h>
#include <Qt3DRenderer/private/annotation_p.h>
#include <Qt3DRenderer/private/effect_p.h>
-#include <Qt3DRenderer/private/renderentity_p.h>
+#include <Qt3DRenderer/private/entity_p.h>
#include <Qt3DRenderer/private/renderlayer_p.h>
#include <Qt3DRenderer/private/rendermaterial_p.h>
#include <Qt3DRenderer/private/rendershader_p.h>
@@ -110,7 +110,7 @@ public:
EffectManager() {}
};
-class EntityManager : public Qt3D::QResourceManager<RenderEntity, Qt3D::QNodeId, 16>
+class EntityManager : public Qt3D::QResourceManager<Entity, Qt3D::QNodeId, 16>
{
public:
EntityManager() {}
@@ -304,7 +304,7 @@ class GeometryManager : public Qt3D::QResourceManager<
Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Annotation, Q_REQUIRES_CLEANUP)
Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Effect, Q_REQUIRES_CLEANUP)
-Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderEntity, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Entity, Q_REQUIRES_CLEANUP)
Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderLayer, Q_REQUIRES_CLEANUP)
Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderMaterial, Q_REQUIRES_CLEANUP)
Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderShader, Q_REQUIRES_CLEANUP)