Renamed QScene to QSceneLoader

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

10 files changed, 17 insertions, 17 deletions

diff --git a/examples/assimp/main.qml b/examples/assimp/main.qml
index 1f2a7db21..b69f26812 100644
--- a/examples/assimp/main.qml
+++ b/examples/assimp/main.qml
@@ -79,7 +79,7 @@ Entity
         }
     }
 
-    Scene
+    SceneLoader
     {
         id: scene
         source: ":/assets/test_scene.dae"
diff --git a/examples/bigmodel-qml/main.qml b/examples/bigmodel-qml/main.qml
index a2d3c19dd..eb8c7927f 100644
--- a/examples/bigmodel-qml/main.qml
+++ b/examples/bigmodel-qml/main.qml
@@ -87,6 +87,6 @@ Entity {
 
     Instantiator {
         model: _meshFileNames
-        delegate: Scene { source: modelData; }
+        delegate: SceneLoader { source: modelData; }
     }
 }
diff --git a/examples/cpp_example/main.cpp b/examples/cpp_example/main.cpp
index 0e4c15df7..738603f69 100644
--- a/examples/cpp_example/main.cpp
+++ b/examples/cpp_example/main.cpp
@@ -55,7 +55,7 @@
 #include <Qt3DCore/qabstracteffect.h>
 #include <Qt3DRenderer/qtexture.h>
 #include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qscene.h>
+#include <Qt3DRenderer/qsceneloader.h>
 
 #include <Qt3DCore/qtranslatetransform.h>
 #include <Qt3DCore/qmatrixtransform.h>
@@ -107,7 +107,7 @@ int main(int ac, char **av)
 
     // Scene file
     Qt3D::QEntity *sceneEntity = new Qt3D::QEntity();
-    Qt3D::QScene  *scene = new Qt3D::QScene();
+    Qt3D::QSceneLoader  *scene = new Qt3D::QSceneLoader();
     scene->setObjectName(QStringLiteral("scene"));
     Qt3D::QTransform *sceneTransform = new Qt3D::QTransform();
     Qt3D::QTranslateTransform *sceneTranslateTransform = new Qt3D::QTranslateTransform();
diff --git a/examples/multiviewport/main.qml b/examples/multiviewport/main.qml
index c570df8d8..07a58c543 100644
--- a/examples/multiviewport/main.qml
+++ b/examples/multiviewport/main.qml
@@ -173,7 +173,7 @@ Entity {
         }
 
 
-        Scene {
+        SceneLoader {
             id: scene
             source: ":/assets/test_scene.dae"
             components : [Transform {
diff --git a/examples/simple-qml/main.qml b/examples/simple-qml/main.qml
index 0e13d35cf..b2558ff2f 100644
--- a/examples/simple-qml/main.qml
+++ b/examples/simple-qml/main.qml
@@ -512,7 +512,7 @@ Entity {
             }
         }
 
-        Scene
+        SceneLoader
         {
             id: scene
             source: ":/assets/test_scene.dae"
diff --git a/examples/torus-cpp/main.cpp b/examples/torus-cpp/main.cpp
index 230810156..e9f6ea261 100644
--- a/examples/torus-cpp/main.cpp
+++ b/examples/torus-cpp/main.cpp
@@ -53,7 +53,7 @@
 #include <Qt3DCore/qabstracteffect.h>
 #include <Qt3DRenderer/qtexture.h>
 #include <Qt3DRenderer/qrenderpass.h>
-#include <Qt3DRenderer/qscene.h>
+#include <Qt3DRenderer/qsceneloader.h>
 
 #include <Qt3DCore/qscaletransform.h>
 #include <Qt3DCore/qrotatetransform.h>
diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index 1e254a932..997881f46 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -43,7 +43,7 @@
 #include <QtQml>
 #include "qt3dquick3drenderplugin.h"
 #include <Qt3DRenderer/qabstractsceneloader.h>
-#include <Qt3DRenderer/qscene.h>
+#include <Qt3DRenderer/qsceneloader.h>
 #include <Qt3DRenderer/tag.h>
 #include <Qt3DRenderer/qmesh.h>
 #include <Qt3DRenderer/qrenderpass.h>
@@ -105,7 +105,7 @@ void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
 {
     // @uri Qt3D.Render
     qmlRegisterUncreatableType<Qt3D::Render::QAbstractSceneLoader>(uri, 2, 0, "QAbstractSceneLoader", "QAbstractScene is abstract");
-    qmlRegisterExtendedType<Qt3D::QScene, Qt3D::Render::Quick::Quick3DScene>(uri, 2, 0, "Scene");
+    qmlRegisterExtendedType<Qt3D::QSceneLoader, Qt3D::Render::Quick::Quick3DScene>(uri, 2, 0, "SceneLoader");
 //    qmlRegisterCustomType<Qt3D::Effect>(uri, 2, 0, "Effect", new Qt3D::Render::Quick::ShaderPropertyParser());
     qmlRegisterExtendedType<Qt3D::QEffect, Qt3D::Render::Quick::Quick3DEffect>(uri, 2, 0, "Effect");
     qmlRegisterExtendedType<Qt3D::QTechnique, Qt3D::Render::Quick::Quick3DTechnique>(uri, 2, 0, "Technique");
diff --git a/src/render/frontend/qscene.cpp b/src/render/frontend/qsceneloader.cpp
index 91dafc528..62ed87ac8 100644
--- a/src/render/frontend/qscene.cpp
+++ b/src/render/frontend/qsceneloader.cpp
@@ -39,20 +39,20 @@
 **
 ****************************************************************************/
 
-#include "qscene.h"
+#include "qsceneloader.h"
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-QScene::QScene(QNode *parent)
+QSceneLoader::QSceneLoader(QNode *parent)
     : Render::QAbstractSceneLoader(parent)
 {
 }
 
-QNode *QScene::doClone(QNode *clonedParent) const
+QNode *QSceneLoader::doClone(QNode *clonedParent) const
 {
-    return new QScene(clonedParent);
+    return new QSceneLoader(clonedParent);
 }
 
 } // Qt3D
diff --git a/src/render/frontend/qscene.h b/src/render/frontend/qsceneloader.h
index b402ae7b0..418547660 100644
--- a/src/render/frontend/qscene.h
+++ b/src/render/frontend/qsceneloader.h
@@ -48,11 +48,11 @@ QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DRENDERERSHARED_EXPORT QScene : public Render::QAbstractSceneLoader
+class QT3DRENDERERSHARED_EXPORT QSceneLoader : public Render::QAbstractSceneLoader
 {
     Q_OBJECT
 public:
-    explicit QScene(QNode *parent = 0);
+    explicit QSceneLoader(QNode *parent = 0);
 
 protected:
     QNode *doClone(QNode *clonedParent) const Q_DECL_OVERRIDE;
diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri
index 15c90be5d..4553c2a00 100644
--- a/src/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
@@ -16,7 +16,7 @@ HEADERS += \
     $$PWD/sphere.h \
     $$PWD/qabstractsceneloader.h \
     $$PWD/qeffect.h \
-    $$PWD/qscene.h \
+    $$PWD/qsceneloader.h \
     $$PWD/qcriterion.h \
     $$PWD/qparameter.h \
     $$PWD/qparameter_p.h \
@@ -75,7 +75,7 @@ SOURCES += \
     $$PWD/sphere.cpp \
     $$PWD/qabstractsceneloader.cpp \
     $$PWD/qeffect.cpp \
-    $$PWD/qscene.cpp \
+    $$PWD/qsceneloader.cpp \
     $$PWD/qcriterion.cpp \
     $$PWD/qparameter.cpp \
     $$PWD/qparametermapper.cpp \