13 files changed, 27 insertions, 34 deletions
diff --git a/src/render/backend/framegraph/cameraselectornode.cpp b/src/render/backend/framegraph/cameraselectornode.cpp
index 17a5cc869..4ee96cb31 100644
--- a/src/render/backend/framegraph/cameraselectornode.cpp
+++ b/src/render/backend/framegraph/cameraselectornode.cpp
@@ -42,7 +42,6 @@
 #include "cameraselectornode_p.h"
 #include <Qt3DRenderer/private/qcameraselector_p.h>
 #include <Qt3DRenderer/private/renderer_p.h>
-#include <Qt3DRenderer/rendereraspect.h>
 #include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/qentity.h>
diff --git a/src/render/backend/framegraph/rendertargetselectornode.cpp b/src/render/backend/framegraph/rendertargetselectornode.cpp
index d7a8bb148..5eb59edc1 100644
--- a/src/render/backend/framegraph/rendertargetselectornode.cpp
+++ b/src/render/backend/framegraph/rendertargetselectornode.cpp
@@ -41,7 +41,6 @@
 
 #include "rendertargetselectornode_p.h"
 #include <Qt3DRenderer/private/renderer_p.h>
-#include <Qt3DRenderer/rendereraspect.h>
 #include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DRenderer/qrendertargetselector.h>
diff --git a/src/render/backend/meshdatamanager.cpp b/src/render/backend/meshdatamanager.cpp
index 4b9266955..d47d182e5 100644
--- a/src/render/backend/meshdatamanager.cpp
+++ b/src/render/backend/meshdatamanager.cpp
@@ -52,7 +52,7 @@ void MeshDataManager::addMeshData(QAbstractMeshFunctorPtr functor, const QUuid &
     m_meshesPending[meshUuid] = functor;
 }
 
-// Called by single thread in RendererAspect
+// Called by single thread in QRenderAspect
 // Needs to be protected as we ways call it while addMeshData is called
 QHash<QUuid, QAbstractMeshFunctorPtr> MeshDataManager::meshesPending()
 {
diff --git a/src/render/backend/rendereraspect.cpp b/src/render/backend/qrenderaspect.cpp
index 2469b5540..5ad668fee 100644
--- a/src/render/backend/rendereraspect.cpp
+++ b/src/render/backend/qrenderaspect.cpp
@@ -39,7 +39,7 @@
 **
 ****************************************************************************/
 
-#include "rendereraspect.h"
+#include "qrenderaspect.h"
 
 #include <Qt3DRenderer/private/rendermesh_p.h>
 #include <Qt3DRenderer/private/meshdatamanager_p.h>
@@ -60,7 +60,6 @@
 #include <Qt3DRenderer/qrendertargetselector.h>
 #include <Qt3DRenderer/qtechniquefilter.h>
 #include <Qt3DRenderer/qviewport.h>
-#include <Qt3DRenderer/rendereraspect.h>
 #include <Qt3DRenderer/renderlogging.h>
 #include <Qt3DRenderer/qrendertarget.h>
 #include <Qt3DRenderer/qclearbuffer.h>
@@ -105,7 +104,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-RendererAspect::RendererAspect(QObject *parent)
+QRenderAspect::QRenderAspect(QObject *parent)
     : QAbstractAspect(QAbstractAspect::AspectRenderer, parent)
     , m_renderer(new Render::Renderer())
 {
@@ -141,7 +140,7 @@ RendererAspect::RendererAspect(QObject *parent)
     registerBackendType<QParameter>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderParameter, Render::ParameterManager>(m_renderer->parameterManager())));
 }
 
-QVector<QAspectJobPtr> RendererAspect::jobsToExecute()
+QVector<QAspectJobPtr> QRenderAspect::jobsToExecute()
 {
     // Create jobs that will get exectued by the threadpool
     QVector<QAspectJobPtr> jobs;
@@ -188,16 +187,16 @@ QVector<QAspectJobPtr> RendererAspect::jobsToExecute()
     return jobs;
 }
 
-void RendererAspect::sceneNodeAdded(QSceneChangePtr &e)
+void QRenderAspect::sceneNodeAdded(QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
     QNode *n = nodePtr.data();
     NodeVisitor visitor;
-    visitor.traverse(n, this, &RendererAspect::visitNode, &RendererAspect::visitNode);
+    visitor.traverse(n, this, &QRenderAspect::visitNode, &QRenderAspect::visitNode);
 }
 
-void RendererAspect::sceneNodeRemoved(QSceneChangePtr &e)
+void QRenderAspect::sceneNodeRemoved(QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = e.staticCast<QScenePropertyChange>();
     QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
@@ -205,30 +204,30 @@ void RendererAspect::sceneNodeRemoved(QSceneChangePtr &e)
     QAbstractAspect::clearBackendNode(n);
 }
 
-void RendererAspect::setRootEntity(QEntity *rootObject)
+void QRenderAspect::setRootEntity(QEntity *rootObject)
 {
     // setSceneGraphRoot is synchronized using the Renderer's mutex
     NodeVisitor visitor;
-    visitor.traverse(rootObject, this, &RendererAspect::visitNode, &RendererAspect::visitNode);
+    visitor.traverse(rootObject, this, &QRenderAspect::visitNode, &QRenderAspect::visitNode);
     m_renderer->setSceneGraphRoot(m_renderer->renderNodesManager()->lookupResource(rootObject->uuid()));
 }
 
-void RendererAspect::onInitialize(QSurface *surface)
+void QRenderAspect::onInitialize(QSurface *surface)
 {
-    m_renderer->setRendererAspect(this);
+    m_renderer->setQRenderAspect(this);
     m_renderer->createAllocators();
     // setSurface is synchronized using the Renderer's mutex
     m_renderer->setSurface(surface);
 }
 
-void RendererAspect::onCleanup()
+void QRenderAspect::onCleanup()
 {
     delete m_renderer;
     //Render::Renderer *renderer = m_renderThread->renderer();
     //QMetaObject::invokeMethod(renderer, "cleanup");
 }
 
-void RendererAspect::visitNode(QNode *node)
+void QRenderAspect::visitNode(QNode *node)
 {
     QAbstractAspect::createBackendNode(node);
 }
diff --git a/src/render/backend/rendereraspect.h b/src/render/backend/qrenderaspect.h
index 9b23cf49f..841ce444e 100644
--- a/src/render/backend/rendereraspect.h
+++ b/src/render/backend/qrenderaspect.h
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3D_RENDERERASPECT_H
-#define QT3D_RENDERERASPECT_H
+#ifndef QT3D_QRENDERASPECT_H
+#define QT3D_QRENDERASPECT_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
 #include <Qt3DCore/qabstractaspect.h>
@@ -56,11 +56,11 @@ class Renderer;
 class RenderSceneObserver;
 }
 
-class QT3DRENDERERSHARED_EXPORT RendererAspect : public QAbstractAspect
+class QT3DRENDERERSHARED_EXPORT QRenderAspect : public QAbstractAspect
 {
     Q_OBJECT
 public:
-    explicit RendererAspect(QObject *parent = 0);
+    explicit QRenderAspect(QObject *parent = 0);
 
     QVector<QAspectJobPtr> jobsToExecute() Q_DECL_OVERRIDE;
 
@@ -82,4 +82,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3D_RENDERERASPECT_H
+#endif // QT3D_QRENDERASPECT_H
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index b46c8ceb5..22cb376eb 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -4,7 +4,7 @@ include("framegraph/framegraph.pri")
 include("jobs/render-jobs.pri")
 
 HEADERS += \
-    $$PWD/rendereraspect.h \
+    $$PWD/qrenderaspect.h \
     $$PWD/renderthread_p.h \
     $$PWD/renderconfiguration_p.h \
     $$PWD/renderdevice_p.h \
@@ -51,7 +51,7 @@ HEADERS += \
     $$PWD/renderparameter_p.h
 
 SOURCES += \
-    $$PWD/rendereraspect.cpp \
+    $$PWD/qrenderaspect.cpp \
     $$PWD/renderthread.cpp \
     $$PWD/renderconfiguration.cpp \
     $$PWD/renderdevice.cpp \
diff --git a/src/render/backend/renderentity_p.h b/src/render/backend/renderentity_p.h
index b7a426ca8..93f2520f0 100644
--- a/src/render/backend/renderentity_p.h
+++ b/src/render/backend/renderentity_p.h
@@ -56,7 +56,7 @@ class QMatrix4x4;
 
 namespace Qt3D {
 
-class RendererAspect;
+class QRenderAspect;
 class Sphere;
 class QNode;
 class QEntity;
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index c8e858237..72da33dfb 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -53,7 +53,7 @@
 #include <Qt3DRenderer/qrenderpass.h>
 #include <Qt3DRenderer/qshaderprogram.h>
 #include <Qt3DRenderer/qtechnique.h>
-#include <Qt3DRenderer/rendereraspect.h>
+#include <Qt3DRenderer/qrenderaspect.h>
 #include <Qt3DRenderer/renderlogging.h>
 #include <Qt3DRenderer/qeffect.h>
 
@@ -540,7 +540,7 @@ void Renderer::submitRenderViews()
 }
 
 // Waits to be told to create jobs for the next frame
-// Called by RendererAspect jobsToExecute context of QAspectThread
+// Called by QRenderAspect jobsToExecute context of QAspectThread
 QVector<QAspectJobPtr> Renderer::createRenderBinJobs()
 {
     // Traverse the current framegraph. For each leaf node create a
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h
index 7c59080fb..4bfdcd1e0 100644
--- a/src/render/backend/renderer_p.h
+++ b/src/render/backend/renderer_p.h
@@ -76,7 +76,7 @@ class QShaderProgram;
 class QMesh;
 class QRenderPass;
 class QAbstractShapeMesh;
-class RendererAspect;
+class QRenderAspect;
 class QFrameAllocator;
 class QOpenGLFilter;
 class AbstractSceneParser;
@@ -130,8 +130,8 @@ public:
     explicit Renderer(int cachedFrames = 5);
     ~Renderer();
 
-    void setRendererAspect(RendererAspect *aspect) { m_rendererAspect = aspect; }
-    RendererAspect *rendererAspect() const { return m_rendererAspect; }
+    void setQRenderAspect(QRenderAspect *aspect) { m_rendererAspect = aspect; }
+    QRenderAspect *rendererAspect() const { return m_rendererAspect; }
 
     void createAllocators();
     void destroyAllocators();
@@ -201,7 +201,7 @@ public:
     QMutex* mutex() { return &m_mutex; }
 
 private:
-    RendererAspect *m_rendererAspect;
+    QRenderAspect *m_rendererAspect;
 
     // Frame graph root
     QUuid m_frameGraphRootUuid;
diff --git a/src/render/backend/rendermesh.cpp b/src/render/backend/rendermesh.cpp
index 0c09d495c..4a88bb5a6 100644
--- a/src/render/backend/rendermesh.cpp
+++ b/src/render/backend/rendermesh.cpp
@@ -41,7 +41,6 @@
 ****************************************************************************/
 
 #include "rendermesh_p.h"
-#include "rendereraspect.h"
 #include "meshdatamanager_p.h"
 #include "qmesh.h"
 
diff --git a/src/render/backend/rendertechnique.cpp b/src/render/backend/rendertechnique.cpp
index 576bfb2ee..b32de6a1f 100644
--- a/src/render/backend/rendertechnique.cpp
+++ b/src/render/backend/rendertechnique.cpp
@@ -45,7 +45,6 @@
 #include <Qt3DRenderer/qparameter.h>
 #include <Qt3DRenderer/qtechnique.h>
 #include <Qt3DRenderer/qopenglfilter.h>
-#include <Qt3DRenderer/rendereraspect.h>
 #include <Qt3DRenderer/private/renderer_p.h>
 #include <Qt3DRenderer/private/renderannotation_p.h>
 #include <Qt3DRenderer/private/rendershader_p.h>
diff --git a/src/render/backend/rendertexture.cpp b/src/render/backend/rendertexture.cpp
index 09082c812..d2f33e19c 100644
--- a/src/render/backend/rendertexture.cpp
+++ b/src/render/backend/rendertexture.cpp
@@ -47,7 +47,6 @@
 #include <QOpenGLPixelTransferOptions>
 #include <qtexture.h>
 #include <texturedata.h>
-#include <Qt3DRenderer/rendereraspect.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DCore/private/qaspectmanager_p.h>
diff --git a/src/render/backend/rendertransform.cpp b/src/render/backend/rendertransform.cpp
index 774d91d62..26ea554ca 100644
--- a/src/render/backend/rendertransform.cpp
+++ b/src/render/backend/rendertransform.cpp
@@ -45,7 +45,6 @@
 #include <Qt3DCore/private/qaspectmanager_p.h>
 #include <Qt3DCore/private/qchangearbiter_p.h>
 #include <Qt3DCore/qtransform.h>
-#include <Qt3DRenderer/rendereraspect.h>
 
 QT_BEGIN_NAMESPACE