Rename Renderer -> Render throughout

This is for consistency between the C++ namespaces and QML imports and
with the other aspects.

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

13 files changed, 91 insertions, 91 deletions

diff --git a/src/render/frontend/qitemmodelbuffer.cpp b/src/render/frontend/qitemmodelbuffer.cpp
index 8de31a818..d11b178fe 100644
--- a/src/render/frontend/qitemmodelbuffer.cpp
+++ b/src/render/frontend/qitemmodelbuffer.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include "qitemmodelbuffer.h"
-#include <Qt3DRenderer/private/graphicscontext_p.h>
+#include <Qt3DRender/private/graphicscontext_p.h>
 #include <QDebug>
 #include <QColor>
 
diff --git a/src/render/frontend/qitemmodelbuffer.h b/src/render/frontend/qitemmodelbuffer.h
index 1a4193868..5c10234ce 100644
--- a/src/render/frontend/qitemmodelbuffer.h
+++ b/src/render/frontend/qitemmodelbuffer.h
@@ -38,10 +38,10 @@
 #define QT3DRENDER_QITEMMODELBUFFER_H
 
 #include <QObject>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
-#include <Qt3DRenderer/qbuffer.h>
-#include <Qt3DRenderer/qattribute.h>
+#include <Qt3DRender/qbuffer.h>
+#include <Qt3DRender/qattribute.h>
 
 #include <QAbstractItemModel>
 #include <QMap>
@@ -50,7 +50,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QItemModelBuffer : public QObject
+class QT3DRENDERSHARED_EXPORT QItemModelBuffer : public QObject
 {
     Q_OBJECT
 public:
diff --git a/src/render/frontend/qlayer.h b/src/render/frontend/qlayer.h
index e877aa108..fc3eda1b1 100644
--- a/src/render/frontend/qlayer.h
+++ b/src/render/frontend/qlayer.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QLAYER_H
 
 #include <Qt3DCore/qcomponent.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <QStringList>
 
 QT_BEGIN_NAMESPACE
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 
 class QLayerPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QLayer : public Qt3DCore::QComponent
+class QT3DRENDERSHARED_EXPORT QLayer : public Qt3DCore::QComponent
 {
     Q_OBJECT
     Q_PROPERTY(QStringList names READ names WRITE setNames NOTIFY namesChanged)
diff --git a/src/render/frontend/qlayer_p.h b/src/render/frontend/qlayer_p.h
index 1efed58ba..494448495 100644
--- a/src/render/frontend/qlayer_p.h
+++ b/src/render/frontend/qlayer_p.h
@@ -49,14 +49,14 @@
 //
 
 #include <private/qcomponent_p.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QLayerPrivate : public Qt3DCore::QComponentPrivate
+class QT3DRENDERSHARED_EXPORT QLayerPrivate : public Qt3DCore::QComponentPrivate
 {
 public:
     QLayerPrivate();
diff --git a/src/render/frontend/qrenderaspect.cpp b/src/render/frontend/qrenderaspect.cpp
index d67090ebb..689ff15c4 100644
--- a/src/render/frontend/qrenderaspect.cpp
+++ b/src/render/frontend/qrenderaspect.cpp
@@ -37,68 +37,68 @@
 #include "qrenderaspect.h"
 #include "qrenderaspect_p.h"
 
-#include <Qt3DRenderer/private/texturedatamanager_p.h>
-#include <Qt3DRenderer/private/renderer_p.h>
-#include <Qt3DRenderer/private/scenemanager_p.h>
-#include <Qt3DRenderer/private/geometryrenderermanager_p.h>
-
-#include <Qt3DRenderer/qabstractsceneloader.h>
-#include <Qt3DRenderer/qcameraselector.h>
-#include <Qt3DRenderer/qframegraph.h>
-#include <Qt3DRenderer/qlayer.h>
-#include <Qt3DRenderer/qlayerfilter.h>
-#include <Qt3DRenderer/qmaterial.h>
-#include <Qt3DRenderer/qmesh.h>
-#include <Qt3DRenderer/qparameter.h>
-#include <Qt3DRenderer/qparametermapping.h>
-#include <Qt3DRenderer/qrenderpassfilter.h>
-#include <Qt3DRenderer/qrendertargetselector.h>
-#include <Qt3DRenderer/qtechniquefilter.h>
-#include <Qt3DRenderer/qviewport.h>
-#include <Qt3DRenderer/qrendertarget.h>
-#include <Qt3DRenderer/qclearbuffer.h>
-#include <Qt3DRenderer/qtexture.h>
-#include <Qt3DRenderer/qeffect.h>
-#include <Qt3DRenderer/qshaderdata.h>
-#include <Qt3DRenderer/qstateset.h>
-#include <Qt3DRenderer/qnodraw.h>
+#include <Qt3DRender/private/texturedatamanager_p.h>
+#include <Qt3DRender/private/renderer_p.h>
+#include <Qt3DRender/private/scenemanager_p.h>
+#include <Qt3DRender/private/geometryrenderermanager_p.h>
+
+#include <Qt3DRender/qabstractsceneloader.h>
+#include <Qt3DRender/qcameraselector.h>
+#include <Qt3DRender/qframegraph.h>
+#include <Qt3DRender/qlayer.h>
+#include <Qt3DRender/qlayerfilter.h>
+#include <Qt3DRender/qmaterial.h>
+#include <Qt3DRender/qmesh.h>
+#include <Qt3DRender/qparameter.h>
+#include <Qt3DRender/qparametermapping.h>
+#include <Qt3DRender/qrenderpassfilter.h>
+#include <Qt3DRender/qrendertargetselector.h>
+#include <Qt3DRender/qtechniquefilter.h>
+#include <Qt3DRender/qviewport.h>
+#include <Qt3DRender/qrendertarget.h>
+#include <Qt3DRender/qclearbuffer.h>
+#include <Qt3DRender/qtexture.h>
+#include <Qt3DRender/qeffect.h>
+#include <Qt3DRender/qshaderdata.h>
+#include <Qt3DRender/qstateset.h>
+#include <Qt3DRender/qnodraw.h>
 #include <Qt3DCore/qcameralens.h>
-#include <Qt3DRenderer/qattribute.h>
-#include <Qt3DRenderer/qbuffer.h>
-#include <Qt3DRenderer/qgeometry.h>
-#include <Qt3DRenderer/qgeometryrenderer.h>
-
-#include <Qt3DRenderer/private/cameraselectornode_p.h>
-#include <Qt3DRenderer/private/layerfilternode_p.h>
-#include <Qt3DRenderer/private/annotation_p.h>
-#include <Qt3DRenderer/private/entity_p.h>
-#include <Qt3DRenderer/private/renderer_p.h>
-#include <Qt3DRenderer/private/shaderdata_p.h>
-#include <Qt3DRenderer/private/renderpassfilternode_p.h>
-#include <Qt3DRenderer/private/rendertargetselectornode_p.h>
-#include <Qt3DRenderer/private/techniquefilternode_p.h>
-#include <Qt3DRenderer/private/viewportnode_p.h>
-#include <Qt3DRenderer/private/rendertarget_p.h>
-#include <Qt3DRenderer/private/scenemanager_p.h>
-#include <Qt3DRenderer/private/clearbuffer_p.h>
-#include <Qt3DRenderer/private/sortmethod_p.h>
-#include <Qt3DRenderer/private/sortcriterion_p.h>
-#include <Qt3DRenderer/private/framegraphsubtreeselector_p.h>
-#include <Qt3DRenderer/private/renderlogging_p.h>
-#include <Qt3DRenderer/private/nodefunctor_p.h>
-#include <Qt3DRenderer/private/framegraphnode_p.h>
-#include <Qt3DRenderer/private/loadtexturedatajob_p.h>
-#include <Qt3DRenderer/private/updateboundingvolumejob_p.h>
-#include <Qt3DRenderer/private/updateworldtransformjob_p.h>
-#include <Qt3DRenderer/private/framecleanupjob_p.h>
-#include <Qt3DRenderer/private/textureimage_p.h>
-#include <Qt3DRenderer/private/statesetnode_p.h>
-#include <Qt3DRenderer/private/nodraw_p.h>
-#include <Qt3DRenderer/private/vsyncframeadvanceservice_p.h>
-#include <Qt3DRenderer/private/attribute_p.h>
-#include <Qt3DRenderer/private/buffer_p.h>
-#include <Qt3DRenderer/private/geometry_p.h>
-#include <Qt3DRenderer/private/geometryrenderer_p.h>
+#include <Qt3DRender/qattribute.h>
+#include <Qt3DRender/qbuffer.h>
+#include <Qt3DRender/qgeometry.h>
+#include <Qt3DRender/qgeometryrenderer.h>
+
+#include <Qt3DRender/private/cameraselectornode_p.h>
+#include <Qt3DRender/private/layerfilternode_p.h>
+#include <Qt3DRender/private/annotation_p.h>
+#include <Qt3DRender/private/entity_p.h>
+#include <Qt3DRender/private/renderer_p.h>
+#include <Qt3DRender/private/shaderdata_p.h>
+#include <Qt3DRender/private/renderpassfilternode_p.h>
+#include <Qt3DRender/private/rendertargetselectornode_p.h>
+#include <Qt3DRender/private/techniquefilternode_p.h>
+#include <Qt3DRender/private/viewportnode_p.h>
+#include <Qt3DRender/private/rendertarget_p.h>
+#include <Qt3DRender/private/scenemanager_p.h>
+#include <Qt3DRender/private/clearbuffer_p.h>
+#include <Qt3DRender/private/sortmethod_p.h>
+#include <Qt3DRender/private/sortcriterion_p.h>
+#include <Qt3DRender/private/framegraphsubtreeselector_p.h>
+#include <Qt3DRender/private/renderlogging_p.h>
+#include <Qt3DRender/private/nodefunctor_p.h>
+#include <Qt3DRender/private/framegraphnode_p.h>
+#include <Qt3DRender/private/loadtexturedatajob_p.h>
+#include <Qt3DRender/private/updateboundingvolumejob_p.h>
+#include <Qt3DRender/private/updateworldtransformjob_p.h>
+#include <Qt3DRender/private/framecleanupjob_p.h>
+#include <Qt3DRender/private/textureimage_p.h>
+#include <Qt3DRender/private/statesetnode_p.h>
+#include <Qt3DRender/private/nodraw_p.h>
+#include <Qt3DRender/private/vsyncframeadvanceservice_p.h>
+#include <Qt3DRender/private/attribute_p.h>
+#include <Qt3DRender/private/buffer_p.h>
+#include <Qt3DRender/private/geometry_p.h>
+#include <Qt3DRender/private/geometryrenderer_p.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qtransform.h>
 #include <Qt3DCore/qnodevisitor.h>
diff --git a/src/render/frontend/qrenderaspect.h b/src/render/frontend/qrenderaspect.h
index 43242fb13..41a1bd9c8 100644
--- a/src/render/frontend/qrenderaspect.h
+++ b/src/render/frontend/qrenderaspect.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QRENDERASPECT_H
 #define QT3DRENDER_QRENDERASPECT_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DCore/qabstractaspect.h>
 
 QT_BEGIN_NAMESPACE
@@ -52,7 +52,7 @@ class Renderer;
 
 class QRenderAspectPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QRenderAspect : public Qt3DCore::QAbstractAspect
+class QT3DRENDERSHARED_EXPORT QRenderAspect : public Qt3DCore::QAbstractAspect
 {
     Q_OBJECT
 public:
diff --git a/src/render/frontend/qrenderaspect_p.h b/src/render/frontend/qrenderaspect_p.h
index c4a54e017..903a6205f 100644
--- a/src/render/frontend/qrenderaspect_p.h
+++ b/src/render/frontend/qrenderaspect_p.h
@@ -49,13 +49,13 @@
 //
 
 #include <Qt3DCore/private/qabstractaspect_p.h>
-#include <Qt3DRenderer/qrenderaspect.h>
-#include <Qt3DRenderer/private/updateboundingvolumejob_p.h>
-#include <Qt3DRenderer/private/updateworldtransformjob_p.h>
-#include <Qt3DRenderer/private/calcboundingvolumejob_p.h>
-#include <Qt3DRenderer/private/framepreparationjob_p.h>
-#include <Qt3DRenderer/private/framecleanupjob_p.h>
-#include <Qt3DRenderer/private/platformsurfacefilter_p.h>
+#include <Qt3DRender/qrenderaspect.h>
+#include <Qt3DRender/private/updateboundingvolumejob_p.h>
+#include <Qt3DRender/private/updateworldtransformjob_p.h>
+#include <Qt3DRender/private/calcboundingvolumejob_p.h>
+#include <Qt3DRender/private/framepreparationjob_p.h>
+#include <Qt3DRender/private/framecleanupjob_p.h>
+#include <Qt3DRender/private/platformsurfacefilter_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/frontend/qrenderattachment.h b/src/render/frontend/qrenderattachment.h
index b19979c5c..89126830a 100644
--- a/src/render/frontend/qrenderattachment.h
+++ b/src/render/frontend/qrenderattachment.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QRENDERATTACHMENT_H
 
 #include <Qt3DCore/qnode.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 class QAbstractTextureProvider;
 class QRenderAttachmentPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QRenderAttachment : public Qt3DCore::QNode
+class QT3DRENDERSHARED_EXPORT QRenderAttachment : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(RenderAttachmentType type READ type WRITE setType NOTIFY typeChanged)
diff --git a/src/render/frontend/qrenderattachment_p.h b/src/render/frontend/qrenderattachment_p.h
index 6624b4694..1a9b7c91d 100644
--- a/src/render/frontend/qrenderattachment_p.h
+++ b/src/render/frontend/qrenderattachment_p.h
@@ -49,7 +49,7 @@
 //
 
 #include <Qt3DCore/private/qnode_p.h>
-#include <Qt3DRenderer/qrenderattachment.h>
+#include <Qt3DRender/qrenderattachment.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/frontend/qrendertarget.h b/src/render/frontend/qrendertarget.h
index 9c0fd9858..930e57764 100644
--- a/src/render/frontend/qrendertarget.h
+++ b/src/render/frontend/qrendertarget.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QRENDERTARGET_H
 
 #include <Qt3DCore/qcomponent.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -47,7 +47,7 @@ namespace Qt3DRender {
 class QRenderTargetPrivate;
 class QRenderAttachment;
 
-class QT3DRENDERERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent
+class QT3DRENDERSHARED_EXPORT QRenderTarget : public Qt3DCore::QComponent
 {
     Q_OBJECT
 public:
diff --git a/src/render/frontend/qwindow.cpp b/src/render/frontend/qwindow.cpp
index da7ee8f8c..d5033c312 100644
--- a/src/render/frontend/qwindow.cpp
+++ b/src/render/frontend/qwindow.cpp
@@ -40,9 +40,9 @@
 #include <Qt3DCore/qaspectengine.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qcamera.h>
-#include <Qt3DRenderer/qframegraph.h>
-#include <Qt3DRenderer/qrenderaspect.h>
-#include <Qt3DRenderer/qforwardrenderer.h>
+#include <Qt3DRender/qframegraph.h>
+#include <Qt3DRender/qrenderaspect.h>
+#include <Qt3DRender/qforwardrenderer.h>
 #include <QOpenGLContext>
 
 QT_BEGIN_NAMESPACE
diff --git a/src/render/frontend/qwindow.h b/src/render/frontend/qwindow.h
index 5ca4686f2..73fceb9de 100644
--- a/src/render/frontend/qwindow.h
+++ b/src/render/frontend/qwindow.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QWINDOW_H
 
 #include <QtGui/qwindow.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -53,7 +53,7 @@ namespace Qt3DRender {
 class QWindowPrivate;
 class QFrameGraph;
 
-class QT3DRENDERERSHARED_EXPORT QWindow : public ::QWindow
+class QT3DRENDERSHARED_EXPORT QWindow : public ::QWindow
 {
 public:
     explicit QWindow(::QWindow *parent = Q_NULLPTR);
diff --git a/src/render/frontend/sphere.h b/src/render/frontend/sphere.h
index faa07c433..99aa252f7 100644
--- a/src/render/frontend/sphere.h
+++ b/src/render/frontend/sphere.h
@@ -37,7 +37,7 @@
 #ifndef SPHERE_H
 #define SPHERE_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DCore/qnodeid.h>
 #include <Qt3DCore/qboundingsphere.h>
 
@@ -48,7 +48,7 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT Sphere : public Qt3DCore::QBoundingSphere
+class QT3DRENDERSHARED_EXPORT Sphere : public Qt3DCore::QBoundingSphere
 {
 public:
     inline Sphere(const Qt3DCore::QNodeId &i = Qt3DCore::QNodeId())