Renamed Entity to QEntity

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

24 files changed, 81 insertions, 81 deletions

diff --git a/src/render/backend/framegraph/cameraselectornode.cpp b/src/render/backend/framegraph/cameraselectornode.cpp
index 8c9a9b918..a8146a016 100644
--- a/src/render/backend/framegraph/cameraselectornode.cpp
+++ b/src/render/backend/framegraph/cameraselectornode.cpp
@@ -46,7 +46,7 @@
 #include <Qt3DRenderer/rendereraspect.h>
 #include <Qt3DCore/qaspectmanager.h>
 #include <Qt3DCore/qchangearbiter.h>
-#include <Qt3DCore/entity.h>
+#include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qscenepropertychange.h>
 #include "renderlogging.h"
 
@@ -85,7 +85,7 @@ void CameraSelector::sceneChangeEvent(const QSceneChangePtr &e)
     if (e->m_type == ComponentUpdated) {
         QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
         if (propertyChange->m_propertyName == QByteArrayLiteral("camera"))
-            setCameraEntity(qobject_cast<Entity*>(propertyChange->m_value.value<QNode*>()));
+            setCameraEntity(qobject_cast<QEntity*>(propertyChange->m_value.value<QNode*>()));
     }
 }
 
diff --git a/src/render/backend/framegraph/cameraselectornode.h b/src/render/backend/framegraph/cameraselectornode.h
index 88455ae57..a17b4c3b2 100644
--- a/src/render/backend/framegraph/cameraselectornode.h
+++ b/src/render/backend/framegraph/cameraselectornode.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class Entity;
+class QEntity;
 class QCameraSelector;
 
 namespace Render {
@@ -67,12 +67,12 @@ public:
     void setPeer(Qt3D::QCameraSelector *peer);
     Qt3D::QCameraSelector *peer() const { return m_peer; }
 
-    void setCameraEntity(Entity *cameraEntity) { m_cameraEntity = cameraEntity; }
-    Entity *cameraEntity() const { return m_cameraEntity; }
+    void setCameraEntity(QEntity *cameraEntity) { m_cameraEntity = cameraEntity; }
+    QEntity *cameraEntity() const { return m_cameraEntity; }
     void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
 private:
-    Entity *m_cameraEntity;
+    QEntity *m_cameraEntity;
     Renderer *m_renderer;
     Qt3D::QCameraSelector *m_peer;
 
diff --git a/src/render/backend/rendercamera.cpp b/src/render/backend/rendercamera.cpp
index e42dfeef2..7cbdba033 100644
--- a/src/render/backend/rendercamera.cpp
+++ b/src/render/backend/rendercamera.cpp
@@ -45,7 +45,7 @@
 
 #include <Qt3DCore/transform.h>
 #include <Qt3DCore/cameralens.h>
-#include <Qt3DCore/entity.h>
+#include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qaspectmanager.h>
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DRenderer/renderer.h>
diff --git a/src/render/backend/renderentity.cpp b/src/render/backend/renderentity.cpp
index 3c8028fb4..bbbeb5ad9 100644
--- a/src/render/backend/renderentity.cpp
+++ b/src/render/backend/renderentity.cpp
@@ -52,7 +52,7 @@
 #include "qabstractshapemesh.h"
 #include <sphere.h>
 
-#include <Qt3DCore/entity.h>
+#include <Qt3DCore/qentity.h>
 #include <Qt3DCore/cameralens.h>
 #include <Qt3DCore/qaspectmanager.h>
 #include <Qt3DCore/qscenepropertychange.h>
@@ -104,7 +104,7 @@ void RenderEntity::setHandle(HRenderNode handle)
     m_handle = handle;
 }
 
-void RenderEntity::setPeer(Entity *peer)
+void RenderEntity::setPeer(QEntity *peer)
 {
     if (m_frontEndPeer != peer) {
         QChangeArbiter *arbiter = m_renderer->rendererAspect()->aspectManager()->changeArbiter();
diff --git a/src/render/backend/renderentity.h b/src/render/backend/renderentity.h
index d62b6f797..d6f7f4551 100644
--- a/src/render/backend/renderentity.h
+++ b/src/render/backend/renderentity.h
@@ -55,7 +55,7 @@ namespace Qt3D {
 class RendererAspect;
 class Sphere;
 class QNode;
-class Entity;
+class QEntity;
 class Transform;
 
 typedef QHandle<QMatrix4x4, 16> HMatrix;
@@ -80,7 +80,7 @@ public:
     void setParentHandle(HRenderNode parentHandle);
     void setRenderer(Renderer *renderer);
     void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
-    void setPeer(Entity *peer);
+    void setPeer(QEntity *peer);
 
     void dump() const;
 
@@ -97,7 +97,7 @@ public:
     QMatrix4x4 *worldTransform();
     Sphere *localBoundingVolume() { return m_localBoundingVolume; }
     Sphere *worldBoundingVolume() { return m_worldBoundingVolume; }
-    Entity *frontEndPeer() const { return m_frontEndPeer; }
+    QEntity *frontEndPeer() const { return m_frontEndPeer; }
 
 private:
 
@@ -114,7 +114,7 @@ private:
 
     // TODO: Do we want to force this to be an Entity?
     // That would mean forcing an Entity for the root on the main thread's scene
-    Entity *m_frontEndPeer;
+    QEntity *m_frontEndPeer;
 
     // TODO: Add pointer to Drawable or references to VBO's and other info needed to draw
 };
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index a77d1d30c..aa5ee7b3e 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -42,7 +42,7 @@
 #include "renderer.h"
 
 #include <Qt3DCore/nodevisitor.h>
-#include <Qt3DCore/entity.h>
+#include <Qt3DCore/qentity.h>
 
 #include "framegraphvisitor.h"
 #include "cameraselectornode.h"
@@ -293,7 +293,7 @@ Render::FrameGraphNode *Renderer::frameGraphRoot() const
 }
 
 // QAspectThread context
-void Renderer::setSceneGraphRoot(Entity *sgRoot)
+void Renderer::setSceneGraphRoot(QEntity *sgRoot)
 {
     Q_ASSERT(sgRoot);
 
@@ -321,7 +321,7 @@ void Renderer::setSceneGraphRoot(Entity *sgRoot)
     //  - World bounding volumes
 }
 
-Entity *Renderer::sceneGraphRoot() const
+QEntity *Renderer::sceneGraphRoot() const
 {
     return m_sceneGraphRoot;
 }
diff --git a/src/render/backend/renderer.h b/src/render/backend/renderer.h
index f4291902e..318c238fd 100644
--- a/src/render/backend/renderer.h
+++ b/src/render/backend/renderer.h
@@ -66,7 +66,7 @@ class QSurface;
 namespace Qt3D {
 
 class Camera;
-class Entity;
+class QEntity;
 class QMaterial;
 class ShaderProgram;
 class QMesh;
@@ -125,8 +125,8 @@ public:
     void setFrameGraphRoot(Render::FrameGraphNode *fgRoot);
     Render::FrameGraphNode *frameGraphRoot() const;
 
-    void setSceneGraphRoot(Entity *sgRoot);
-    Entity *sceneGraphRoot() const;
+    void setSceneGraphRoot(QEntity *sgRoot);
+    QEntity *sceneGraphRoot() const;
     RenderEntity *renderSceneRoot() const { return m_renderSceneRoot; }
 
     void render();
@@ -179,7 +179,7 @@ private:
     // Frame graph root
     Render::FrameGraphNode *m_frameGraphRoot;
 
-    Entity *m_sceneGraphRoot;
+    QEntity *m_sceneGraphRoot;
     RenderEntity *m_renderSceneRoot;
 
     QHash<QMaterial*, RenderMaterial*> m_materialHash;
diff --git a/src/render/backend/rendereraspect.cpp b/src/render/backend/rendereraspect.cpp
index 7d74c5227..b1764eef6 100644
--- a/src/render/backend/rendereraspect.cpp
+++ b/src/render/backend/rendereraspect.cpp
@@ -123,13 +123,13 @@ QVector<QJobPtr> RendererAspect::jobsToExecute()
     return jobs;
 }
 
-void RendererAspect::registerAspectHelper(Entity *rootObject)
+void RendererAspect::registerAspectHelper(QEntity *rootObject)
 {
     Render::Renderer *renderer = m_renderThread->renderer();
     renderer->setSceneGraphRoot(rootObject);
 }
 
-void RendererAspect::unregisterAspectHelper(Entity *rootObject)
+void RendererAspect::unregisterAspectHelper(QEntity *rootObject)
 {
     Q_UNUSED(rootObject);
 }
diff --git a/src/render/backend/rendereraspect.h b/src/render/backend/rendereraspect.h
index da981cd4d..3c4560c4d 100644
--- a/src/render/backend/rendereraspect.h
+++ b/src/render/backend/rendereraspect.h
@@ -66,8 +66,8 @@ public:
     QVector<QJobPtr> jobsToExecute() Q_DECL_OVERRIDE;
 
 protected:
-    void registerAspectHelper(Entity *rootObject) Q_DECL_OVERRIDE;
-    void unregisterAspectHelper(Entity *rootObject) Q_DECL_OVERRIDE;
+    void registerAspectHelper(QEntity *rootObject) Q_DECL_OVERRIDE;
+    void unregisterAspectHelper(QEntity *rootObject) Q_DECL_OVERRIDE;
 
     void initializeHelper(QAspectManager *aspectManager);
     void cleanupHelper();
diff --git a/src/render/backend/renderscenebuilder.cpp b/src/render/backend/renderscenebuilder.cpp
index a1e766be8..a394a9656 100644
--- a/src/render/backend/renderscenebuilder.cpp
+++ b/src/render/backend/renderscenebuilder.cpp
@@ -77,7 +77,7 @@
 #include <Qt3DCore/camera.h>
 #include <Qt3DCore/cameralens.h>
 #include <Qt3DCore/transform.h>
-#include <Qt3DCore/entity.h>
+#include <Qt3DCore/qentity.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -102,7 +102,7 @@ void RenderSceneBuilder::initializeFrameGraph()
     // Into the scenegraph
     qCDebug(Render::Backend) << Q_FUNC_INFO << "FrameGraph";
     // Retrieve and set Renderer FrameGraph
-    QFrameGraph *fg = Entity::findComponentInTree<QFrameGraph>(rootNode()->frontEndPeer());
+    QFrameGraph *fg = QEntity::findComponentInTree<QFrameGraph>(rootNode()->frontEndPeer());
     m_frameGraphEntityNode = m_renderer->renderNodesManager()->lookupHandle(fg->parentNode()->asEntity()->uuid());
     createFrameGraph(fg);
 }
@@ -188,7 +188,7 @@ Render::FrameGraphNode *RenderSceneBuilder::backendFrameGraphNode(QNode *block)
         cameraSelectorNode->setRenderer(m_renderer);
         cameraSelectorNode->setPeer(cameraSelector);
         // TO DO : We might as well store an Entity in CameraSelector
-        Entity *cameraEntity = cameraSelector->camera()->asEntity();
+        QEntity *cameraEntity = cameraSelector->camera()->asEntity();
         // If the Entity is declared inline on the QML Side, the Entity is not set as part of the Scene tree
         // So we need to make sure the RenderNode for the given Entity exists in the RenderNodesMananger
         if (cameraEntity && m_renderer->cameraManager()->lookupHandle(cameraEntity->uuid()).isNull()) {
@@ -224,7 +224,7 @@ Render::FrameGraphNode *RenderSceneBuilder::backendFrameGraphNode(QNode *block)
     return Q_NULLPTR;
 }
 
-HRenderNode RenderSceneBuilder::createRenderNode(Entity *entity)
+HRenderNode RenderSceneBuilder::createRenderNode(QEntity *entity)
 {
     HRenderNode renderNodeHandle;
     renderNodeHandle = m_renderer->renderNodesManager()->getOrAcquireHandle(entity->uuid());
@@ -240,7 +240,7 @@ HRenderNode RenderSceneBuilder::createRenderNode(Entity *entity)
     return renderNodeHandle;
 }
 
-void RenderSceneBuilder::createRenderMaterial(Entity *entity)
+void RenderSceneBuilder::createRenderMaterial(QEntity *entity)
 {
     // Parse Materials to retrieve
     // Material
@@ -268,7 +268,7 @@ void RenderSceneBuilder::createFrameGraph(QFrameGraph *fg)
     m_renderer->setFrameGraphRoot(frameGraphRootNode);
 }
 
-void RenderSceneBuilder::visitEntity(Qt3D::Entity *entity)
+void RenderSceneBuilder::visitEntity(Qt3D::QEntity *entity)
 {
     // Create a RenderNode corresponding to the Entity. Most data will
     // be calculated later by jobs
diff --git a/src/render/backend/renderscenebuilder.h b/src/render/backend/renderscenebuilder.h
index 0093913ae..3d04774e6 100644
--- a/src/render/backend/renderscenebuilder.h
+++ b/src/render/backend/renderscenebuilder.h
@@ -45,7 +45,7 @@
 #include <Qt3DCore/nodevisitor.h>
 #include <Qt3DCore/qhandle.h>
 #include <QStack>
-#include <Qt3DCore/entity.h>
+#include <Qt3DCore/qentity.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -75,7 +75,7 @@ public:
     void        initializeFrameGraph();
 
 protected:
-    void visitEntity(Qt3D::Entity *entity) Q_DECL_OVERRIDE;
+    void visitEntity(Qt3D::QEntity *entity) Q_DECL_OVERRIDE;
 
 private:
     Renderer *m_renderer;
@@ -86,12 +86,12 @@ private:
     Render::FrameGraphNode* buildFrameGraph(QNode *node);
     Render::FrameGraphNode* backendFrameGraphNode(QNode *);
 
-    HRenderNode createRenderNode(Entity *node);
-    void createRenderMaterial(Entity *entity);
+    HRenderNode createRenderNode(QEntity *node);
+    void createRenderMaterial(QEntity *entity);
     void createFrameGraph(QFrameGraph *frameGraph);
 
     template<class Frontend, class Backend, class Manager>
-    void createRenderElement(Entity *entity, Manager *manager)
+    void createRenderElement(QEntity *entity, Manager *manager)
     {
         QList<Frontend *> elems = entity->componentsOfType<Frontend>();
         if (!elems.isEmpty()) {
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index 641bcf317..35204bcde 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -72,7 +72,7 @@
 #include "renderlayer.h"
 #include "layermanager.h"
 
-#include <Qt3DCore/entity.h>
+#include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qabstracteffect.h>
 #include <Qt3DCore/qabstracttechnique.h>
 #include <Qt3DCore/qframeallocator.h>
@@ -212,7 +212,7 @@ void RenderView::setConfigFromFrameGraphLeafNode(FrameGraphNode *fgLeaf)
         switch (type) {
         case FrameGraphNode::CameraSelector: {
             CameraSelector *cameraSelector = static_cast<CameraSelector *>(node);
-            Entity *cameraEntity = cameraSelector->cameraEntity();
+            QEntity *cameraEntity = cameraSelector->cameraEntity();
             if (cameraEntity != Q_NULLPTR) {
                 m_renderCamera = m_renderer->cameraManager()->lookupResource(cameraEntity->uuid());
                 RenderEntity *tmpCamNode = m_renderer->renderNodesManager()->lookupResource(cameraEntity->uuid());
@@ -286,7 +286,7 @@ void RenderView::buildRenderCommands(RenderEntity *node)
 
     // 1 RenderCommand per RenderPass pass on an Entity with a Mesh
 
-    Entity *frontEndEntity = Q_NULLPTR;
+    QEntity *frontEndEntity = Q_NULLPTR;
     if (m_renderCamera != Q_NULLPTR && node->frontEndPeer() != Q_NULLPTR
             && (frontEndEntity = node->frontEndPeer()->asEntity()) != Q_NULLPTR
             && checkContainedWithinLayer(frontEndEntity->uuid())) {
diff --git a/src/render/frontend/framegraph-components/qcameraselector.cpp b/src/render/frontend/framegraph-components/qcameraselector.cpp
index 09b887405..1db35b0a3 100644
--- a/src/render/frontend/framegraph-components/qcameraselector.cpp
+++ b/src/render/frontend/framegraph-components/qcameraselector.cpp
@@ -41,7 +41,7 @@
 
 #include "qcameraselector.h"
 #include "qcameraselector_p.h"
-#include <Qt3DCore/entity.h>
+#include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qscenepropertychange.h>
 
 QT_BEGIN_NAMESPACE
@@ -62,7 +62,7 @@ QCameraSelector::QCameraSelector(Qt3D::QNode *parent)
     :   QFrameGraphItem(*new QCameraSelectorPrivate(this), parent)
 {}
 
-void QCameraSelector::setCamera(Entity *camera)
+void QCameraSelector::setCamera(QEntity *camera)
 {
     Q_D(QCameraSelector);
     if (d->m_camera != camera) {
@@ -75,7 +75,7 @@ void QCameraSelector::setCamera(Entity *camera)
     }
 }
 
-Entity *QCameraSelector::camera() const
+QEntity *QCameraSelector::camera() const
 {
     Q_D(const QCameraSelector);
     return d->m_camera;
diff --git a/src/render/frontend/framegraph-components/qcameraselector.h b/src/render/frontend/framegraph-components/qcameraselector.h
index 803f38904..f292590b2 100644
--- a/src/render/frontend/framegraph-components/qcameraselector.h
+++ b/src/render/frontend/framegraph-components/qcameraselector.h
@@ -55,13 +55,13 @@ class QCameraSelectorPrivate;
 class QT3DRENDERERSHARED_EXPORT QCameraSelector : public QFrameGraphItem
 {
     Q_OBJECT
-    Q_PROPERTY(Qt3D::Entity *camera READ camera WRITE setCamera NOTIFY cameraChanged)
+    Q_PROPERTY(Qt3D::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged)
 
 public:
     explicit QCameraSelector(QNode *parent = 0);
 
-    void setCamera(Entity *camera);
-    Entity *camera() const;
+    void setCamera(QEntity *camera);
+    QEntity *camera() const;
 
 Q_SIGNALS:
     void cameraChanged();
diff --git a/src/render/frontend/framegraph-components/qcameraselector_p.h b/src/render/frontend/framegraph-components/qcameraselector_p.h
index 2016ab9f0..e79697a65 100644
--- a/src/render/frontend/framegraph-components/qcameraselector_p.h
+++ b/src/render/frontend/framegraph-components/qcameraselector_p.h
@@ -56,7 +56,7 @@ public:
     QCameraSelectorPrivate(QCameraSelector *qq);
 
     Q_DECLARE_PUBLIC(QCameraSelector)
-    Entity *m_camera;
+    QEntity *m_camera;
 };
 
 
diff --git a/src/render/frontend/framegraph-components/qframegraph.cpp b/src/render/frontend/framegraph-components/qframegraph.cpp
index f509a64f1..30dff26ef 100644
--- a/src/render/frontend/framegraph-components/qframegraph.cpp
+++ b/src/render/frontend/framegraph-components/qframegraph.cpp
@@ -41,7 +41,7 @@
 
 #include "qframegraph.h"
 #include "qframegraph_p.h"
-#include <Qt3DCore/entity.h>
+#include <Qt3DCore/qentity.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/frontend/qabstractscene.cpp b/src/render/frontend/qabstractscene.cpp
index 569a3cac2..c1818b241 100644
--- a/src/render/frontend/qabstractscene.cpp
+++ b/src/render/frontend/qabstractscene.cpp
@@ -53,7 +53,7 @@ namespace Qt3D {
 namespace Render {
 
 QAbstractScenePrivate::QAbstractScenePrivate(QAbstractScene *qq)
-    : EntityPrivate(qq)
+    : QEntityPrivate(qq)
     , m_sceneNode(Q_NULLPTR)
     , m_sceneChild(Q_NULLPTR)
     , m_currentParser(Q_NULLPTR)
@@ -61,12 +61,12 @@ QAbstractScenePrivate::QAbstractScenePrivate(QAbstractScene *qq)
 }
 
 QAbstractScene::QAbstractScene(QAbstractScenePrivate &dd, QNode *parent)
-    : Entity(dd, parent)
+    : QEntity(dd, parent)
 {
 }
 
 QAbstractScene::QAbstractScene(QNode *parent)
-    : Entity(*new QAbstractScenePrivate(this), parent)
+    : QEntity(*new QAbstractScenePrivate(this), parent)
 {
     Q_D(QAbstractScene);
     d->m_sceneNode = this;
diff --git a/src/render/frontend/qabstractscene.h b/src/render/frontend/qabstractscene.h
index d024a1c14..f329541c9 100644
--- a/src/render/frontend/qabstractscene.h
+++ b/src/render/frontend/qabstractscene.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_QABSTRACTSCENE_H
 #define QT3D_QABSTRACTSCENE_H
 
-#include <Qt3DCore/entity.h>
+#include <Qt3DCore/qentity.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
@@ -56,7 +56,7 @@ namespace Render {
 class QAbstractScene;
 class QAbstractScenePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractScene : public Entity
+class QT3DRENDERERSHARED_EXPORT QAbstractScene : public QEntity
 {
     Q_OBJECT
     Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged)
diff --git a/src/render/frontend/qabstractscene_p.h b/src/render/frontend/qabstractscene_p.h
index fc35858e5..fff88988c 100644
--- a/src/render/frontend/qabstractscene_p.h
+++ b/src/render/frontend/qabstractscene_p.h
@@ -42,7 +42,7 @@
 #ifndef QT3D_QABSTRACTSCENE_P_H
 #define QT3D_QABSTRACTSCENE_P_H
 
-#include <private/entity_p.h>
+#include <private/qentity_p.h>
 #include <Qt3DRenderer/qt3drenderer_global.h>
 
 QT_BEGIN_NAMESPACE
@@ -55,7 +55,7 @@ namespace Render {
 
 class QAbstractScene;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractScenePrivate : public EntityPrivate
+class QT3DRENDERERSHARED_EXPORT QAbstractScenePrivate : public QEntityPrivate
 {
 public:
     QAbstractScenePrivate(QAbstractScene *qq);
diff --git a/src/render/io/abstractsceneparser.h b/src/render/io/abstractsceneparser.h
index bf5fb8683..33241fcad 100644
--- a/src/render/io/abstractsceneparser.h
+++ b/src/render/io/abstractsceneparser.h
@@ -49,7 +49,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class Entity;
+class QEntity;
 
 class AbstractSceneParser : public QObject
 {
@@ -72,8 +72,8 @@ public:
 
     virtual void    setFilePath(const QString &path) = 0;
     virtual bool    isPathExtensionSupported(const QString &path) = 0;
-    virtual Entity *scene(QString id) = 0;
-    virtual Entity *node(QString id) = 0;
+    virtual QEntity *scene(QString id) = 0;
+    virtual QEntity *node(QString id) = 0;
 
     ParserStatus parserStatus() const;
     QStringList  errors() const;
diff --git a/src/render/io/assimpparser.cpp b/src/render/io/assimpparser.cpp
index 64f5f56f1..edaea3ecb 100644
--- a/src/render/io/assimpparser.cpp
+++ b/src/render/io/assimpparser.cpp
@@ -49,7 +49,7 @@
 #include <QFileInfo>
 #include <QColor>
 #include <qmath.h>
-#include <Qt3DCore/entity.h>
+#include <Qt3DCore/qentity.h>
 #include <qmaterial.h>
 #include <texture.h>
 #include "renderlogging.h"
@@ -248,7 +248,7 @@ bool AssimpParser::isPathExtensionSupported(const QString &path)
  *
  * Returns Q_NULLPTR if \a id was specified but not node matching it can be found.
  */
-Entity *AssimpParser::scene(QString id)
+QEntity *AssimpParser::scene(QString id)
 {
     // m_aiScene shouldn't be null.
     // If it is either, the file failed to be imported or
@@ -273,7 +273,7 @@ Entity *AssimpParser::scene(QString id)
  *  Returns a Node from the scene identified by \a id.
  *  Returns Q_NULLPTR if no node can be found.
  */
-Entity *AssimpParser::node(QString id)
+QEntity *AssimpParser::node(QString id)
 {
     if (m_aiScene.isNull())
         return Q_NULLPTR;
@@ -285,11 +285,11 @@ Entity *AssimpParser::node(QString id)
 /*!
  * Returns a Node from an Assimp aiNode \a node.
  */
-Entity *AssimpParser::node(aiNode *node)
+QEntity *AssimpParser::node(aiNode *node)
 {
     if (node == Q_NULLPTR)
         return Q_NULLPTR;
-    Entity *entityNode = new Entity();
+    QEntity *entityNode = new QEntity();
 
     // Add Meshes to the node
     for (uint i = 0; i < node->mNumMeshes; i++) {
@@ -306,7 +306,7 @@ Entity *AssimpParser::node(aiNode *node)
     for (uint i = 0; i < node->mNumChildren; i++) {
         // this-> is necessary here otherwise
         // it conflicts with the variable node
-        Entity *child = this->node(node->mChildren[i]);
+        QEntity *child = this->node(node->mChildren[i]);
         if (child != Q_NULLPTR)
             entityNode->addChild(child);
     }
@@ -598,7 +598,7 @@ void AssimpParser::loadCamera(uint cameraIndex)
     if (cameraNode == Q_NULLPTR)
         return ;
 
-    Entity  *camera = new Entity();
+    QEntity  *camera = new QEntity();
     CameraLens *lens = new CameraLens();
     aiMatrix4x4 cm;
 
diff --git a/src/render/io/assimpparser.h b/src/render/io/assimpparser.h
index 18c10be3c..61a22c7d7 100644
--- a/src/render/io/assimpparser.h
+++ b/src/render/io/assimpparser.h
@@ -80,10 +80,10 @@ public:
     // SceneParserInterface interface
     void setFilePath(const QString& path) Q_DECL_OVERRIDE;
     bool isPathExtensionSupported(const QString &path) Q_DECL_OVERRIDE;
-    Entity *scene(QString id = QString()) Q_DECL_OVERRIDE;
-    Entity *node(QString id) Q_DECL_OVERRIDE;
+    QEntity *scene(QString id = QString()) Q_DECL_OVERRIDE;
+    QEntity *node(QString id) Q_DECL_OVERRIDE;
 
-    Entity *defaultScene();
+    QEntity *defaultScene();
     MeshDataPtr mesh(QString id);
     QMaterial *material(QString id);
     Camera *camera(QString id);
@@ -102,7 +102,7 @@ private :
     static QStringList assimpSupportedFormats();
     static QMatrix4x4 aiMatrix4x4ToQMatrix4x4(const aiMatrix4x4 &matrix);
 
-    Entity *node(aiNode *node);
+    QEntity *node(aiNode *node);
 
     void readSceneFile(const QString &file);
 
@@ -134,7 +134,7 @@ private :
     QMap<uint, QEffect *> m_effects;
     QMap<uint, Texture*> m_embeddedTextures;
     QMap<QString, Texture*> m_materialTextures;
-    QMap<aiNode*, Entity*> m_cameras;
+    QMap<aiNode*, QEntity*> m_cameras;
 
     QHash<aiTextureType, QString> m_textureToParameterName;
 
diff --git a/src/render/io/gltfparser.cpp b/src/render/io/gltfparser.cpp
index c2d6d8209..901afc02e 100644
--- a/src/render/io/gltfparser.cpp
+++ b/src/render/io/gltfparser.cpp
@@ -44,7 +44,7 @@
 #include "texturedata.h"
 #include "renderlogging.h"
 
-#include <Qt3DCore/entity.h>
+#include <Qt3DCore/qentity.h>
 #include <qmesh.h>
 #include <qmaterial.h>
 #include <qtechnique.h>
@@ -280,7 +280,7 @@ MeshDataPtr GLTFParser::mesh(QString id)
     return MeshDataPtr();
 }
 
-Entity* GLTFParser::defaultScene()
+QEntity* GLTFParser::defaultScene()
 {
     parse();
     if (m_defaultScene.isEmpty()) {
@@ -291,7 +291,7 @@ Entity* GLTFParser::defaultScene()
     return scene(m_defaultScene);
 }
 
-Entity* GLTFParser::scene(QString id)
+QEntity* GLTFParser::scene(QString id)
 {
     parse();
 
@@ -302,10 +302,10 @@ Entity* GLTFParser::scene(QString id)
     }
 
     QJsonObject sceneObj = scenes.value(id).toObject();
-    Entity* sceneEntity = new Entity;
+    QEntity* sceneEntity = new QEntity;
     foreach (QJsonValue nnv, sceneObj.value(KEY_NODES).toArray()) {
         QString nodeName = nnv.toString();
-        Entity* child = node(nodeName);
+        QEntity* child = node(nodeName);
         if (!child)
             continue;
 
@@ -315,7 +315,7 @@ Entity* GLTFParser::scene(QString id)
     return sceneEntity;
 }
 
-Entity* GLTFParser::node(QString id)
+QEntity* GLTFParser::node(QString id)
 {
     QJsonObject nodes = m_json.object().value(KEY_NODES).toObject();
     if (!nodes.contains(id)) {
@@ -324,13 +324,13 @@ Entity* GLTFParser::node(QString id)
     }
 
     QJsonObject jsonObj = nodes.value(id).toObject();
-    Entity* result( new Entity );
+    QEntity* result( new QEntity );
     parse();
 
     if ( jsonObj.contains(KEY_CHILDREN) )
     {
         foreach (QJsonValue c, jsonObj.value(KEY_CHILDREN).toArray()) {
-            Entity* child = node(c.toString());
+            QEntity* child = node(c.toString());
             if (!child)
                 continue;
             result->addChild(child);
@@ -365,7 +365,7 @@ Entity* GLTFParser::node(QString id)
         } else {
             // need to make a child entity per material
             foreach (QString matId, materialDict.keys()) {
-                Entity* subEntity(new Entity);
+                QEntity* subEntity(new QEntity);
                 result->addChild(subEntity);
 
                 subEntity->addComponent(material(matId));
diff --git a/src/render/io/gltfparser.h b/src/render/io/gltfparser.h
index 43cc86c4d..23f4fa7d4 100644
--- a/src/render/io/gltfparser.h
+++ b/src/render/io/gltfparser.h
@@ -44,7 +44,7 @@
 
 #include <Qt3DRenderer/meshdata.h>
 #include <Qt3DRenderer/qattribute.h>
-#include <Qt3DCore/entity.h>
+#include <Qt3DCore/qentity.h>
 #include <Qt3DRenderer/qtechnique.h>
 #include <Qt3DRenderer/qbuffer.h>
 #include <QJsonDocument>
@@ -86,11 +86,11 @@ public:
      * @brief instantiate Create Nodes based on glTf JSON document
      * @return A new scene-graph fragment based on the provided glTf
      */
-    Entity *node(QString id) Q_DECL_OVERRIDE;
-    Entity *scene(QString id) Q_DECL_OVERRIDE;
+    QEntity *node(QString id) Q_DECL_OVERRIDE;
+    QEntity *scene(QString id) Q_DECL_OVERRIDE;
 
 
-    Entity *defaultScene();
+    QEntity *defaultScene();
     MeshDataPtr mesh(QString id);
     QMaterial *material(QString id);
     CameraLens *camera(QString id);