Rename RenderEntity -> Entity

Change-Id: Ifb5f3882e9bd584536321dde97eac2c471528f27
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>

10 files changed, 30 insertions, 30 deletions

diff --git a/src/render/backend/jobs/framecleanupjob.cpp b/src/render/backend/jobs/framecleanupjob.cpp
index 91aa3bef2..e0d9a876f 100644
--- a/src/render/backend/jobs/framecleanupjob.cpp
+++ b/src/render/backend/jobs/framecleanupjob.cpp
@@ -36,7 +36,7 @@
 
 #include "framecleanupjob_p.h"
 #include <private/renderer_p.h>
-#include <private/renderentity_p.h>
+#include <private/entity_p.h>
 #include <private/rendershaderdata_p.h>
 #include <private/managers_p.h>
 #include <private/texturedatamanager_p.h>
diff --git a/src/render/backend/jobs/framecleanupjob_p.h b/src/render/backend/jobs/framecleanupjob_p.h
index f200130e8..c0afc13d5 100644
--- a/src/render/backend/jobs/framecleanupjob_p.h
+++ b/src/render/backend/jobs/framecleanupjob_p.h
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 namespace Render {
 
 class Renderer;
-class RenderEntity;
+class Entity;
 
 class FrameCleanupJob : public Qt3D::QAspectJob
 {
diff --git a/src/render/backend/jobs/framepreparationjob.cpp b/src/render/backend/jobs/framepreparationjob.cpp
index b573a5fdf..9fd6c99b1 100644
--- a/src/render/backend/jobs/framepreparationjob.cpp
+++ b/src/render/backend/jobs/framepreparationjob.cpp
@@ -36,7 +36,7 @@
 
 #include "framepreparationjob_p.h"
 #include <Qt3DRenderer/private/renderer_p.h>
-#include <Qt3DRenderer/private/renderentity_p.h>
+#include <Qt3DRenderer/private/entity_p.h>
 #include <Qt3DRenderer/private/rendershaderdata_p.h>
 #include <Qt3DRenderer/sphere.h>
 
@@ -45,7 +45,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 namespace Render {
 
-FramePreparationJob::FramePreparationJob(RenderEntity *root)
+FramePreparationJob::FramePreparationJob(Entity *root)
     : m_root(root)
 {
 }
@@ -60,7 +60,7 @@ void FramePreparationJob::run()
     parseNodeTree(m_root);
 }
 
-void FramePreparationJob::parseNodeTree(RenderEntity *node)
+void FramePreparationJob::parseNodeTree(Entity *node)
 {
     // Initialize worldBoundingVolume if Mesh associated
     Qt3DRender::Render::RenderGeometryRenderer *mesh = Q_NULLPTR;
@@ -85,7 +85,7 @@ void FramePreparationJob::parseNodeTree(RenderEntity *node)
     }
 
     // Traverse children
-    Q_FOREACH (RenderEntity *child, node->children())
+    Q_FOREACH (Entity *child, node->children())
         parseNodeTree(child);
 }
 
diff --git a/src/render/backend/jobs/framepreparationjob_p.h b/src/render/backend/jobs/framepreparationjob_p.h
index 5de978639..cc5c7feef 100644
--- a/src/render/backend/jobs/framepreparationjob_p.h
+++ b/src/render/backend/jobs/framepreparationjob_p.h
@@ -46,21 +46,21 @@ namespace Qt3DRender {
 namespace Render {
 
 class Renderer;
-class RenderEntity;
+class Entity;
 
 class FramePreparationJob : public Qt3D::QAspectJob
 {
 public:
-    FramePreparationJob(RenderEntity *root);
+    FramePreparationJob(Entity *root);
     ~FramePreparationJob();
 
 protected:
     void run() Q_DECL_FINAL;
 
 private:
-    void parseNodeTree(RenderEntity *node);
+    void parseNodeTree(Entity *node);
 
-    RenderEntity *m_root;
+    Entity *m_root;
 };
 
 typedef QSharedPointer<FramePreparationJob> FramePreparationJobPtr;
diff --git a/src/render/backend/jobs/renderviewjobutils.cpp b/src/render/backend/jobs/renderviewjobutils.cpp
index f70f7f224..4a886cfd9 100644
--- a/src/render/backend/jobs/renderviewjobutils.cpp
+++ b/src/render/backend/jobs/renderviewjobutils.cpp
@@ -89,7 +89,7 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN
                 // Can be set only once and we take camera nearest to the leaf node
                 if (!rv->renderCamera()) {
                     const CameraSelector *cameraSelector = static_cast<const CameraSelector *>(node);
-                    RenderEntity *camNode = renderer->renderNodesManager()->lookupResource(cameraSelector->cameraUuid());
+                    Entity *camNode = renderer->renderNodesManager()->lookupResource(cameraSelector->cameraUuid());
                     if (camNode) {
                         CameraLens *lens = camNode->renderComponent<CameraLens>();
                         if (lens && lens->isEnabled()) {
diff --git a/src/render/backend/jobs/renderviewjobutils_p.h b/src/render/backend/jobs/renderviewjobutils_p.h
index 3bcedaba5..7d625c3e3 100644
--- a/src/render/backend/jobs/renderviewjobutils_p.h
+++ b/src/render/backend/jobs/renderviewjobutils_p.h
@@ -54,7 +54,7 @@ namespace Render {
 class FrameGraphNode;
 class ParameterManager;
 class Effect;
-class RenderEntity;
+class Entity;
 class RenderMaterial;
 class RenderRenderPass;
 class RenderStateSet;
diff --git a/src/render/backend/jobs/updateboundingvolumejob.cpp b/src/render/backend/jobs/updateboundingvolumejob.cpp
index a346a0bee..3c8f47262 100644
--- a/src/render/backend/jobs/updateboundingvolumejob.cpp
+++ b/src/render/backend/jobs/updateboundingvolumejob.cpp
@@ -37,7 +37,7 @@
 #include "updateboundingvolumejob_p.h"
 
 #include <Qt3DRenderer/private/renderer_p.h>
-#include <Qt3DRenderer/private/renderentity_p.h>
+#include <Qt3DRenderer/private/entity_p.h>
 #include <Qt3DRenderer/private/renderlogging_p.h>
 #include <sphere.h>
 
@@ -52,9 +52,9 @@ namespace Render {
 
 namespace {
 
-void expandWorldBoundingVolume(Qt3DRender::Render::RenderEntity *node)
+void expandWorldBoundingVolume(Qt3DRender::Render::Entity *node)
 {
-    Qt3DRender::Render::RenderEntity *currentNode = node;
+    Qt3DRender::Render::Entity *currentNode = node;
     QStack<int> childIndexStack;
     forever {
 
@@ -68,12 +68,12 @@ void expandWorldBoundingVolume(Qt3DRender::Render::RenderEntity *node)
             return;
 
         // Initialize parent bounding volume to be equal to that of the first child
-        Qt3DRender::Render::RenderEntity *parentNode = currentNode->parent();
+        Qt3DRender::Render::Entity *parentNode = currentNode->parent();
         Qt3DRender::Sphere *parentBoundingVolume = parentNode->worldBoundingVolume();
         *(parentBoundingVolume) = *(currentNode->worldBoundingVolume());
 
         // Expand the parent bounding volume by each of remaining the siblings
-        QVector<RenderEntity *> siblings = parentNode->children();
+        QVector<Entity *> siblings = parentNode->children();
         const int siblingCount = siblings.count();
         for (int i = 1; i < siblingCount; ++i) {
             Qt3DRender::Sphere *siblingBoundingVolume = siblings.at(i)->worldBoundingVolume();
@@ -85,7 +85,7 @@ void expandWorldBoundingVolume(Qt3DRender::Render::RenderEntity *node)
         currentNode = Q_NULLPTR;
         if (!childIndexStack.empty() && parentNode->parent()) {
             const int nextSiblingIndex = childIndexStack.top()++;
-            QVector<RenderEntity *> parentSiblings = parentNode->parent()->children();
+            QVector<Entity *> parentSiblings = parentNode->parent()->children();
             if (nextSiblingIndex < parentSiblings.size())
                 currentNode = parentSiblings.at(nextSiblingIndex);
         }
@@ -94,7 +94,7 @@ void expandWorldBoundingVolume(Qt3DRender::Render::RenderEntity *node)
 
 }
 
-UpdateBoundingVolumeJob::UpdateBoundingVolumeJob(RenderEntity *node)
+UpdateBoundingVolumeJob::UpdateBoundingVolumeJob(Entity *node)
     : m_node(node)
 {
 }
diff --git a/src/render/backend/jobs/updateboundingvolumejob_p.h b/src/render/backend/jobs/updateboundingvolumejob_p.h
index 349ce1c13..a26a1906b 100644
--- a/src/render/backend/jobs/updateboundingvolumejob_p.h
+++ b/src/render/backend/jobs/updateboundingvolumejob_p.h
@@ -46,18 +46,18 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 namespace Render {
 
-class RenderEntity;
+class Entity;
 
 class UpdateBoundingVolumeJob : public Qt3D::QAspectJob
 {
 public:
-    explicit UpdateBoundingVolumeJob(RenderEntity *m_node);
+    explicit UpdateBoundingVolumeJob(Entity *m_node);
 
 protected:
     void run() Q_DECL_OVERRIDE;
 
 private:
-    RenderEntity *m_node;
+    Entity *m_node;
 };
 
 typedef QSharedPointer<UpdateBoundingVolumeJob> UpdateBoundingVolumeJobPtr;
diff --git a/src/render/backend/jobs/updateworldtransformjob.cpp b/src/render/backend/jobs/updateworldtransformjob.cpp
index 42ead834c..ea98f4f9d 100644
--- a/src/render/backend/jobs/updateworldtransformjob.cpp
+++ b/src/render/backend/jobs/updateworldtransformjob.cpp
@@ -37,7 +37,7 @@
 #include "updateworldtransformjob_p.h"
 
 #include <Qt3DRenderer/private/renderer_p.h>
-#include <Qt3DRenderer/private/renderentity_p.h>
+#include <Qt3DRenderer/private/entity_p.h>
 #include <sphere.h>
 #include <Qt3DRenderer/private/rendertransform_p.h>
 #include <Qt3DRenderer/private/renderlogging_p.h>
@@ -50,7 +50,7 @@ namespace Render {
 
 namespace {
 
-void updateWorldTransformAndBounds(Qt3DRender::Render::RenderEntity *node, const QMatrix4x4 &parentTransform)
+void updateWorldTransformAndBounds(Qt3DRender::Render::Entity *node, const QMatrix4x4 &parentTransform)
 {
     QMatrix4x4 worldTransform(parentTransform);
     RenderTransform *nodeTransform = node->renderComponent<RenderTransform>();
@@ -60,13 +60,13 @@ void updateWorldTransformAndBounds(Qt3DRender::Render::RenderEntity *node, const
     *(node->worldTransform()) = worldTransform;
     *(node->worldBoundingVolume()) = node->localBoundingVolume()->transformed(worldTransform);
 
-    Q_FOREACH (Qt3DRender::Render::RenderEntity *child, node->children())
+    Q_FOREACH (Qt3DRender::Render::Entity *child, node->children())
         updateWorldTransformAndBounds(child, worldTransform);
 }
 
 }
 
-UpdateWorldTransformJob::UpdateWorldTransformJob(RenderEntity *node)
+UpdateWorldTransformJob::UpdateWorldTransformJob(Entity *node)
     : Qt3D::QAspectJob()
     , m_node(node)
 {
@@ -84,7 +84,7 @@ void UpdateWorldTransformJob::run()
     qCDebug(Jobs) << "Entering" << Q_FUNC_INFO << QThread::currentThread();
 
     QMatrix4x4 parentTransform;
-    RenderEntity *parent = m_node->parent();
+    Entity *parent = m_node->parent();
     if (parent != Q_NULLPTR)
         parentTransform = *(parent->worldTransform());
     updateWorldTransformAndBounds(m_node, parentTransform);
diff --git a/src/render/backend/jobs/updateworldtransformjob_p.h b/src/render/backend/jobs/updateworldtransformjob_p.h
index 168792dfc..81559cf42 100644
--- a/src/render/backend/jobs/updateworldtransformjob_p.h
+++ b/src/render/backend/jobs/updateworldtransformjob_p.h
@@ -46,18 +46,18 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 namespace Render {
 
-class RenderEntity;
+class Entity;
 
 class UpdateWorldTransformJob : public Qt3D::QAspectJob
 {
 public:
-    explicit UpdateWorldTransformJob(RenderEntity *node);
+    explicit UpdateWorldTransformJob(Entity *node);
 
 protected:
     void run() Q_DECL_OVERRIDE;
 
 private:
-    RenderEntity *m_node;
+    Entity *m_node;
 };
 
 typedef QSharedPointer<UpdateWorldTransformJob> UpdateWorldTransformJobPtr;