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>

15 files changed, 50 insertions, 50 deletions

diff --git a/src/render/texture/qabstracttextureimage.h b/src/render/texture/qabstracttextureimage.h
index a7eed7d91..a34306314 100644
--- a/src/render/texture/qabstracttextureimage.h
+++ b/src/render/texture/qabstracttextureimage.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QABSTRACTTEXTUREIMAGE_H
 
 #include <Qt3DCore/qabstractfunctor.h>
-#include <Qt3DRenderer/qabstracttextureprovider.h>
+#include <Qt3DRender/qabstracttextureprovider.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -48,7 +48,7 @@ namespace Qt3DRender {
 // We might also get rid of the layer, face, mipmap level from
 // TexImageDataPtr and store that in the functor directly
 // or use the QTextureImage instead
-class QT3DRENDERERSHARED_EXPORT QTextureDataFunctor : public Qt3DCore::QAbstractFunctor
+class QT3DRENDERSHARED_EXPORT QTextureDataFunctor : public Qt3DCore::QAbstractFunctor
 {
 public:
     virtual ~QTextureDataFunctor() {}
@@ -60,7 +60,7 @@ typedef QSharedPointer<QTextureDataFunctor> QTextureDataFunctorPtr;
 
 class QAbstractTextureImagePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode
+class QT3DRENDERSHARED_EXPORT QAbstractTextureImage : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(int mipmapLevel READ mipmapLevel WRITE setMipmapLevel NOTIFY mipmapLevelChanged)
diff --git a/src/render/texture/qabstracttextureimage_p.h b/src/render/texture/qabstracttextureimage_p.h
index abd95e302..e3529c428 100644
--- a/src/render/texture/qabstracttextureimage_p.h
+++ b/src/render/texture/qabstracttextureimage_p.h
@@ -49,8 +49,8 @@
 //
 
 #include <Qt3DCore/private/qnode_p.h>
-#include <Qt3DRenderer/private/qt3drenderer_global_p.h>
-#include <Qt3DRenderer/qabstracttextureprovider.h>
+#include <Qt3DRender/private/qt3drender_global_p.h>
+#include <Qt3DRender/qabstracttextureprovider.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -58,7 +58,7 @@ namespace Qt3DRender {
 
 class QAbstractTextureImage;
 
-class QT3DRENDERERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3DCore::QNodePrivate
+class QT3DRENDERSHARED_PRIVATE_EXPORT QAbstractTextureImagePrivate : public Qt3DCore::QNodePrivate
 {
 public:
     QAbstractTextureImagePrivate()
diff --git a/src/render/texture/qabstracttextureprovider.cpp b/src/render/texture/qabstracttextureprovider.cpp
index bed56a14b..e85121f7f 100644
--- a/src/render/texture/qabstracttextureprovider.cpp
+++ b/src/render/texture/qabstracttextureprovider.cpp
@@ -37,7 +37,7 @@
 #include "qabstracttextureprovider.h"
 #include "qabstracttextureprovider_p.h"
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/qabstracttextureimage.h>
+#include <Qt3DRender/qabstracttextureimage.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/texture/qabstracttextureprovider.h b/src/render/texture/qabstracttextureprovider.h
index 96d4f403c..09644a0e5 100644
--- a/src/render/texture/qabstracttextureprovider.h
+++ b/src/render/texture/qabstracttextureprovider.h
@@ -37,8 +37,8 @@
 #ifndef QT3DRENDER_QABSTRACTTEXTUREPROVIDER_H
 #define QT3DRENDER_QABSTRACTTEXTUREPROVIDER_H
 
-#include <Qt3DRenderer/texturedata.h>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/texturedata.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DCore/qnode.h>
 
 QT_BEGIN_NAMESPACE
@@ -49,7 +49,7 @@ class QAbstractTextureProviderPrivate;
 class QTextureWrapMode;
 class QAbstractTextureImage;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractTextureProvider : public Qt3DCore::QNode
+class QT3DRENDERSHARED_EXPORT QAbstractTextureProvider : public Qt3DCore::QNode
 {
     Q_OBJECT
     Q_PROPERTY(Target target READ target CONSTANT)
diff --git a/src/render/texture/qabstracttextureprovider_p.h b/src/render/texture/qabstracttextureprovider_p.h
index c1df87de9..b27ef3660 100644
--- a/src/render/texture/qabstracttextureprovider_p.h
+++ b/src/render/texture/qabstracttextureprovider_p.h
@@ -48,10 +48,10 @@
 // We mean it.
 //
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <Qt3DCore/private/qnode_p.h>
-#include <Qt3DRenderer/qabstracttextureprovider.h>
-#include <Qt3DRenderer/qwrapmode.h>
+#include <Qt3DRender/qabstracttextureprovider.h>
+#include <Qt3DRender/qwrapmode.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/texture/qtexture.h b/src/render/texture/qtexture.h
index d794f5b08..84f84fc3d 100644
--- a/src/render/texture/qtexture.h
+++ b/src/render/texture/qtexture.h
@@ -38,10 +38,10 @@
 #define QT3DRENDER_QTEXTURE_H
 
 #include <QOpenGLTexture>
-#include <Qt3DRenderer/texturedata.h>
-#include <Qt3DRenderer/qwrapmode.h>
-#include <Qt3DRenderer/qtextureproviders.h>
-#include <Qt3DRenderer/qtextureimage.h>
+#include <Qt3DRender/texturedata.h>
+#include <Qt3DRender/qwrapmode.h>
+#include <Qt3DRender/qtextureproviders.h>
+#include <Qt3DRender/qtextureimage.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/texture/qtextureimage.h b/src/render/texture/qtextureimage.h
index 51a612f37..357cc9ebf 100644
--- a/src/render/texture/qtextureimage.h
+++ b/src/render/texture/qtextureimage.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_QTEXTUREIMAGE_H
 
 #include <QUrl>
-#include <Qt3DRenderer/qabstracttextureimage.h>
+#include <Qt3DRender/qabstracttextureimage.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QTextureImagePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QTextureImage : public QAbstractTextureImage
+class QT3DRENDERSHARED_EXPORT QTextureImage : public QAbstractTextureImage
 {
     Q_OBJECT
     Q_PROPERTY(QUrl source READ source WRITE setSource NOTIFY sourceChanged)
diff --git a/src/render/texture/qtextureproviders.h b/src/render/texture/qtextureproviders.h
index 4cf2f7289..17e4a62d5 100644
--- a/src/render/texture/qtextureproviders.h
+++ b/src/render/texture/qtextureproviders.h
@@ -37,13 +37,13 @@
 #ifndef QT3DRENDER_QTEXTUREPROVIDERS_H
 #define QT3DRENDER_QTEXTUREPROVIDERS_H
 
-#include <Qt3DRenderer/qabstracttextureprovider.h>
+#include <Qt3DRender/qabstracttextureprovider.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT QTexture1D : public QAbstractTextureProvider
+class QT3DRENDERSHARED_EXPORT QTexture1D : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
@@ -51,7 +51,7 @@ public:
     ~QTexture1D();
 };
 
-class QT3DRENDERERSHARED_EXPORT QTexture1DArray : public QAbstractTextureProvider
+class QT3DRENDERSHARED_EXPORT QTexture1DArray : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
@@ -59,7 +59,7 @@ public:
     ~QTexture1DArray();
 };
 
-class QT3DRENDERERSHARED_EXPORT QTexture2D : public QAbstractTextureProvider
+class QT3DRENDERSHARED_EXPORT QTexture2D : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
@@ -67,7 +67,7 @@ public:
     ~QTexture2D();
 };
 
-class QT3DRENDERERSHARED_EXPORT QTexture2DArray : public QAbstractTextureProvider
+class QT3DRENDERSHARED_EXPORT QTexture2DArray : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
@@ -75,7 +75,7 @@ public:
     ~QTexture2DArray();
 };
 
-class QT3DRENDERERSHARED_EXPORT QTexture3D : public QAbstractTextureProvider
+class QT3DRENDERSHARED_EXPORT QTexture3D : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
@@ -83,7 +83,7 @@ public:
     ~QTexture3D();
 };
 
-class QT3DRENDERERSHARED_EXPORT QTextureCubeMap : public QAbstractTextureProvider
+class QT3DRENDERSHARED_EXPORT QTextureCubeMap : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
@@ -91,7 +91,7 @@ public:
     ~QTextureCubeMap();
 };
 
-class QT3DRENDERERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTextureProvider
+class QT3DRENDERSHARED_EXPORT QTextureCubeMapArray : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
@@ -99,7 +99,7 @@ public:
     ~QTextureCubeMapArray();
 };
 
-class QT3DRENDERERSHARED_EXPORT QTexture2DMultisample : public QAbstractTextureProvider
+class QT3DRENDERSHARED_EXPORT QTexture2DMultisample : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
@@ -107,7 +107,7 @@ public:
     ~QTexture2DMultisample();
 };
 
-class QT3DRENDERERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTextureProvider
+class QT3DRENDERSHARED_EXPORT QTexture2DMultisampleArray : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
@@ -115,7 +115,7 @@ public:
     ~QTexture2DMultisampleArray();
 };
 
-class QT3DRENDERERSHARED_EXPORT QTextureRectangle : public QAbstractTextureProvider
+class QT3DRENDERSHARED_EXPORT QTextureRectangle : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
@@ -123,7 +123,7 @@ public:
     ~QTextureRectangle();
 };
 
-class QT3DRENDERERSHARED_EXPORT QTextureBuffer : public QAbstractTextureProvider
+class QT3DRENDERSHARED_EXPORT QTextureBuffer : public QAbstractTextureProvider
 {
     Q_OBJECT
 public:
diff --git a/src/render/texture/qwrapmode.h b/src/render/texture/qwrapmode.h
index 6254fe5bf..4bd2cc1ff 100644
--- a/src/render/texture/qwrapmode.h
+++ b/src/render/texture/qwrapmode.h
@@ -37,7 +37,7 @@
 #ifndef QT3DRENDER_QWRAPMODE_H
 #define QT3DRENDER_QWRAPMODE_H
 
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 #include <QObject>
 
 QT_BEGIN_NAMESPACE
@@ -46,7 +46,7 @@ namespace Qt3DRender {
 
 class QTextureWrapModePrivate;
 
-class QT3DRENDERERSHARED_EXPORT QTextureWrapMode : public QObject
+class QT3DRENDERSHARED_EXPORT QTextureWrapMode : public QObject
 {
     Q_OBJECT
     Q_PROPERTY(WrapMode x READ x WRITE setX NOTIFY xChanged)
diff --git a/src/render/texture/texture.cpp b/src/render/texture/texture.cpp
index edbf26b68..c665e3cf8 100644
--- a/src/render/texture/texture.cpp
+++ b/src/render/texture/texture.cpp
@@ -41,12 +41,12 @@
 #include <QOpenGLFunctions>
 #include <QOpenGLTexture>
 #include <QOpenGLPixelTransferOptions>
-#include <Qt3DRenderer/qtexture.h>
-#include <Qt3DRenderer/texturedata.h>
+#include <Qt3DRender/qtexture.h>
+#include <Qt3DRender/texturedata.h>
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DCore/private/qaspectmanager_p.h>
-#include <Qt3DRenderer/private/managers_p.h>
-#include <Qt3DRenderer/private/texturedatamanager_p.h>
+#include <Qt3DRender/private/managers_p.h>
+#include <Qt3DRender/private/texturedatamanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/texture/texture_p.h b/src/render/texture/texture_p.h
index 313dc40b0..a784a4e91 100644
--- a/src/render/texture/texture_p.h
+++ b/src/render/texture/texture_p.h
@@ -50,10 +50,10 @@
 
 #include <QOpenGLContext>
 #include <QMutex>
-#include <Qt3DRenderer/qtexture.h>
-#include <Qt3DRenderer/texturedata.h>
+#include <Qt3DRender/qtexture.h>
+#include <Qt3DRender/texturedata.h>
 #include <Qt3DCore/qbackendnode.h>
-#include <Qt3DRenderer/private/handle_types_p.h>
+#include <Qt3DRender/private/handle_types_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/texture/texturedata.h b/src/render/texture/texturedata.h
index 2f3fdb9a9..031bd441b 100644
--- a/src/render/texture/texturedata.h
+++ b/src/render/texture/texturedata.h
@@ -40,13 +40,13 @@
 #include <QOpenGLTexture>
 #include <QImage>
 #include <QSharedPointer>
-#include <Qt3DRenderer/qt3drenderer_global.h>
+#include <Qt3DRender/qt3drender_global.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 
-class QT3DRENDERERSHARED_EXPORT TexImageData
+class QT3DRENDERSHARED_EXPORT TexImageData
 {
 public:
     TexImageData();
diff --git a/src/render/texture/texturedatamanager_p.h b/src/render/texture/texturedatamanager_p.h
index fcdabebce..9748b3699 100644
--- a/src/render/texture/texturedatamanager_p.h
+++ b/src/render/texture/texturedatamanager_p.h
@@ -49,9 +49,9 @@
 //
 
 #include <Qt3DCore/private/qresourcemanager_p.h>
-#include <Qt3DRenderer/qtexture.h>
-#include <Qt3DRenderer/texturedata.h>
-#include <Qt3DRenderer/private/handle_types_p.h>
+#include <Qt3DRender/qtexture.h>
+#include <Qt3DRender/texturedata.h>
+#include <Qt3DRender/private/handle_types_p.h>
 
 #include <QPair>
 #include <Qt3DCore/qnodeid.h>
diff --git a/src/render/texture/textureimage.cpp b/src/render/texture/textureimage.cpp
index 96c6cbd3e..3504833ae 100644
--- a/src/render/texture/textureimage.cpp
+++ b/src/render/texture/textureimage.cpp
@@ -36,8 +36,8 @@
 
 #include "textureimage_p.h"
 #include <Qt3DCore/qscenepropertychange.h>
-#include <Qt3DRenderer/private/managers_p.h>
-#include <Qt3DRenderer/private/texturedatamanager_p.h>
+#include <Qt3DRender/private/managers_p.h>
+#include <Qt3DRender/private/texturedatamanager_p.h>
 
 QT_BEGIN_NAMESPACE
 
diff --git a/src/render/texture/textureimage_p.h b/src/render/texture/textureimage_p.h
index bde1e58ca..28aa275ec 100644
--- a/src/render/texture/textureimage_p.h
+++ b/src/render/texture/textureimage_p.h
@@ -50,9 +50,9 @@
 
 #include <qglobal.h>
 #include <Qt3DCore/qbackendnode.h>
-#include <Qt3DRenderer/qabstracttextureprovider.h>
-#include <Qt3DRenderer/qabstracttextureimage.h>
-#include <Qt3DRenderer/private/handle_types_p.h>
+#include <Qt3DRender/qabstracttextureprovider.h>
+#include <Qt3DRender/qabstracttextureimage.h>
+#include <Qt3DRender/private/handle_types_p.h>
 
 QT_BEGIN_NAMESPACE