Renamed QAbstractScene to QAbstractSceneLoader

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

11 files changed, 57 insertions, 57 deletions

diff --git a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
index 7d52753d1..1e254a932 100644
--- a/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
+++ b/src/quick3d/imports/render/qt3dquick3drenderplugin.cpp
@@ -42,7 +42,7 @@
 
 #include <QtQml>
 #include "qt3dquick3drenderplugin.h"
-#include <Qt3DRenderer/qabstractscene.h>
+#include <Qt3DRenderer/qabstractsceneloader.h>
 #include <Qt3DRenderer/qscene.h>
 #include <Qt3DRenderer/tag.h>
 #include <Qt3DRenderer/qmesh.h>
@@ -104,7 +104,7 @@ QT_BEGIN_NAMESPACE
 void Qt3DQuick3DRenderPlugin::registerTypes(const char *uri)
 {
     // @uri Qt3D.Render
-    qmlRegisterUncreatableType<Qt3D::Render::QAbstractScene>(uri, 2, 0, "QAbstractScene", "QAbstractScene is abstract");
+    qmlRegisterUncreatableType<Qt3D::Render::QAbstractSceneLoader>(uri, 2, 0, "QAbstractSceneLoader", "QAbstractScene is abstract");
     qmlRegisterExtendedType<Qt3D::QScene, Qt3D::Render::Quick::Quick3DScene>(uri, 2, 0, "Scene");
 //    qmlRegisterCustomType<Qt3D::Effect>(uri, 2, 0, "Effect", new Qt3D::Render::Quick::ShaderPropertyParser());
     qmlRegisterExtendedType<Qt3D::QEffect, Qt3D::Render::Quick::Quick3DEffect>(uri, 2, 0, "Effect");
diff --git a/src/quick3d/quick3drenderer/items/quick3dscene.h b/src/quick3d/quick3drenderer/items/quick3dscene.h
index 8589ebebf..665ebaf60 100644
--- a/src/quick3d/quick3drenderer/items/quick3dscene.h
+++ b/src/quick3d/quick3drenderer/items/quick3dscene.h
@@ -44,7 +44,7 @@
 
 #include <Qt3DQuickRenderer/qt3dquickrenderer_global.h>
 #include <Qt3DQuick/quick3dentity.h>
-#include <Qt3DRenderer/qabstractscene.h>
+#include <Qt3DRenderer/qabstractsceneloader.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -60,7 +60,7 @@ class QT3DQUICKRENDERERSHARED_EXPORT Quick3DScene : public QObject
 public:
     explicit Quick3DScene(QObject *parent = 0);
 
-    inline QAbstractScene *parentScene() const { return qobject_cast<QAbstractScene*>(parent()); }
+    inline QAbstractSceneLoader *parentScene() const { return qobject_cast<QAbstractSceneLoader *>(parent()); }
 
     Q_INVOKABLE QNode *node(QString id);
     Q_INVOKABLE QNode *scene(QString id);
diff --git a/src/render/backend/renderscene.cpp b/src/render/backend/renderscene.cpp
index 34678515f..f27eff28b 100644
--- a/src/render/backend/renderscene.cpp
+++ b/src/render/backend/renderscene.cpp
@@ -45,7 +45,7 @@
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DRenderer/private/renderer_p.h>
 #include <Qt3DRenderer/rendereraspect.h>
-#include <Qt3DRenderer/qabstractscene.h>
+#include <Qt3DRenderer/qabstractsceneloader.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -64,7 +64,7 @@ void RenderScene::setRenderer(Renderer *renderer)
     m_renderer = renderer;
 }
 
-void RenderScene::setPeer(QAbstractScene *peer)
+void RenderScene::setPeer(QAbstractSceneLoader *peer)
 {
     QUuid peerUuid;
     if (peer)
diff --git a/src/render/backend/renderscene_p.h b/src/render/backend/renderscene_p.h
index 3f29c3450..3373da34c 100644
--- a/src/render/backend/renderscene_p.h
+++ b/src/render/backend/renderscene_p.h
@@ -54,7 +54,7 @@ namespace Qt3D {
 namespace Render {
 
 class Renderer;
-class QAbstractScene;
+class QAbstractSceneLoader;
 
 class RenderScene
         : public QObserverInterface
@@ -64,7 +64,7 @@ public:
     RenderScene();
 
     void setRenderer(Renderer *renderer);
-    void setPeer(QAbstractScene *peer);
+    void setPeer(QAbstractSceneLoader *peer);
 
     // QObserverInterface interface
     void sceneChangeEvent(const QSceneChangePtr &e) Q_DECL_OVERRIDE;
diff --git a/src/render/backend/renderscenebuilder.cpp b/src/render/backend/renderscenebuilder.cpp
index 1065cfd97..f018f9050 100644
--- a/src/render/backend/renderscenebuilder.cpp
+++ b/src/render/backend/renderscenebuilder.cpp
@@ -42,7 +42,7 @@
 #include "renderscenebuilder_p.h"
 
 #include <Qt3DRenderer/qabstractlight.h>
-#include <Qt3DRenderer/qabstractscene.h>
+#include <Qt3DRenderer/qabstractsceneloader.h>
 #include <Qt3DRenderer/qabstractshapemesh.h>
 #include <Qt3DRenderer/qcameraselector.h>
 #include <Qt3DRenderer/qframegraph.h>
@@ -227,8 +227,8 @@ void RenderSceneBuilder::createRenderElement(QNode *frontend)
         createRenderElementHelper<QShaderProgram, RenderShader, ShaderManager>(frontend,
                                                                                m_renderer->shaderManager());
     }
-    else if (qobject_cast<QAbstractScene *>(frontend)) {
-        createRenderElementHelper<QAbstractScene, RenderScene, SceneManager>(frontend,
+    else if (qobject_cast<QAbstractSceneLoader *>(frontend)) {
+        createRenderElementHelper<QAbstractSceneLoader, RenderScene, SceneManager>(frontend,
                                                                             m_renderer->sceneManager());
     }
     else if (qobject_cast<QTexture *>(frontend)) {
@@ -290,7 +290,7 @@ void RenderSceneBuilder::releaseRenderElement(QNode *frontend)
         m_renderer->renderTargetManager()->releaseResource(frontend->uuid());
     else if (qobject_cast<QRenderAttachment *>(frontend))
         m_renderer->attachmentManager()->releaseResource(frontend->uuid());
-    else if (qobject_cast<QAbstractScene *>(frontend))
+    else if (qobject_cast<QAbstractSceneLoader *>(frontend))
         m_renderer->sceneManager()->releaseResource(frontend->uuid());
     else if (qobject_cast<QTexture *>(frontend))
         m_renderer->textureManager()->releaseResource(frontend->uuid());
diff --git a/src/render/frontend/qabstractscene.cpp b/src/render/frontend/qabstractsceneloader.cpp
index 9c3dce0b9..2b0220c9b 100644
--- a/src/render/frontend/qabstractscene.cpp
+++ b/src/render/frontend/qabstractsceneloader.cpp
@@ -39,8 +39,8 @@
 **
 ****************************************************************************/
 
-#include "qabstractscene.h"
-#include "qabstractscene_p.h"
+#include "qabstractsceneloader.h"
+#include "qabstractsceneloader_p.h"
 #include "renderlogging.h"
 #include <Qt3DRenderer/private/abstractsceneparser_p.h>
 #include <Qt3DRenderer/private/gltfparser_p.h>
@@ -52,7 +52,7 @@ namespace Qt3D {
 
 namespace Render {
 
-QAbstractScenePrivate::QAbstractScenePrivate(QAbstractScene *qq)
+QAbstractSceneLoaderPrivate::QAbstractSceneLoaderPrivate(QAbstractSceneLoader *qq)
     : QComponentPrivate(qq)
     , m_sceneNode(Q_NULLPTR)
     , m_sceneChild(Q_NULLPTR)
@@ -60,46 +60,46 @@ QAbstractScenePrivate::QAbstractScenePrivate(QAbstractScene *qq)
 {
 }
 
-QAbstractScene::QAbstractScene(QAbstractScenePrivate &dd, QNode *parent)
+QAbstractSceneLoader::QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, QNode *parent)
     : QComponent(dd, parent)
 {
 }
 
-QAbstractScene::QAbstractScene(QNode *parent)
-    : QComponent(*new QAbstractScenePrivate(this), parent)
+QAbstractSceneLoader::QAbstractSceneLoader(QNode *parent)
+    : QComponent(*new QAbstractSceneLoaderPrivate(this), parent)
 {
-    Q_D(QAbstractScene);
+    Q_D(QAbstractSceneLoader);
     d->m_sceneNode = this;
 }
 
-void QAbstractScene::copy(const QNode *ref)
+void QAbstractSceneLoader::copy(const QNode *ref)
 {
-    Q_D(QAbstractScene);
-    const QAbstractScene *s = qobject_cast<const QAbstractScene *>(ref);
+    Q_D(QAbstractSceneLoader);
+    const QAbstractSceneLoader *s = qobject_cast<const QAbstractSceneLoader *>(ref);
     if (s != Q_NULLPTR) {
         d->m_sceneId = s->sceneId();
         d->m_source = s->source();
     }
 }
 
-QString QAbstractScene::source() const
+QString QAbstractSceneLoader::source() const
 {
-    Q_D(const QAbstractScene);
+    Q_D(const QAbstractSceneLoader);
     return d->m_source;
 }
 
-QString QAbstractScene::sceneId() const
+QString QAbstractSceneLoader::sceneId() const
 {
-    Q_D(const QAbstractScene);
+    Q_D(const QAbstractSceneLoader);
     return d->m_sceneId;
 }
 
-QAbstractScene *QAbstractScene::findInTree(QNode *root)
+QAbstractSceneLoader *QAbstractSceneLoader::findInTree(QNode *root)
 {
     if (!root)
         return Q_NULLPTR;
 
-    QAbstractScene* s = qobject_cast<QAbstractScene*>(root);
+    QAbstractSceneLoader* s = qobject_cast<QAbstractSceneLoader*>(root);
     if (s)
         return s;
 
@@ -113,15 +113,15 @@ QAbstractScene *QAbstractScene::findInTree(QNode *root)
     return Q_NULLPTR;
 }
 
-void QAbstractScene::clear()
+void QAbstractSceneLoader::clear()
 {
-    Q_D(QAbstractScene);
+    Q_D(QAbstractSceneLoader);
     d->m_sceneNode->removeAllChildren();
 }
 
-void QAbstractScene::setSource(QString arg)
+void QAbstractSceneLoader::setSource(QString arg)
 {
-    Q_D(QAbstractScene);
+    Q_D(QAbstractSceneLoader);
     if (d->m_source != arg) {
         d->m_source = arg;
         rebuild();
@@ -133,9 +133,9 @@ void QAbstractScene::setSource(QString arg)
     }
 }
 
-void QAbstractScene::setSceneId(QString arg)
+void QAbstractSceneLoader::setSceneId(QString arg)
 {
-    Q_D(QAbstractScene);
+    Q_D(QAbstractSceneLoader);
     if (d->m_sceneId != arg) {
         d->m_sceneId = arg;
         rebuild();
@@ -143,26 +143,26 @@ void QAbstractScene::setSceneId(QString arg)
     }
 }
 
-QNode *QAbstractScene::node(QString id)
+QNode *QAbstractSceneLoader::node(QString id)
 {
-    Q_D(QAbstractScene);
+    Q_D(QAbstractSceneLoader);
     if (d->m_currentParser)
         return d->m_currentParser->node(id);
     return Q_NULLPTR;
 }
 
-QNode *QAbstractScene::scene(QString id)
+QNode *QAbstractSceneLoader::scene(QString id)
 {
-    Q_D(QAbstractScene);
+    Q_D(QAbstractSceneLoader);
     if (d->m_currentParser)
         return d->m_currentParser->scene(id);
     return Q_NULLPTR;
 }
 
 // Move that into a jobs
-void QAbstractScene::rebuild()
+void QAbstractSceneLoader::rebuild()
 {
-    Q_D(QAbstractScene);
+    Q_D(QAbstractSceneLoader);
     if (d->m_sceneChild != Q_NULLPTR) {
         d->m_sceneNode->removeChild(d->m_sceneChild);
         d->m_sceneChild->deleteLater();
diff --git a/src/render/frontend/qabstractscene.h b/src/render/frontend/qabstractsceneloader.h
index 2e32b5bca..55f941ba6 100644
--- a/src/render/frontend/qabstractscene.h
+++ b/src/render/frontend/qabstractsceneloader.h
@@ -50,16 +50,16 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 namespace Render {
 
-class QAbstractScene;
-class QAbstractScenePrivate;
+class QAbstractSceneLoader;
+class QAbstractSceneLoaderPrivate;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractScene : public QComponent
+class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoader : public QComponent
 {
     Q_OBJECT
     Q_PROPERTY(QString source READ source WRITE setSource NOTIFY sourceChanged)
     Q_PROPERTY(QString sceneId READ sceneId WRITE setSceneId NOTIFY sceneIdChanged)
 public:
-    explicit QAbstractScene(QNode *parent = 0);
+    explicit QAbstractSceneLoader(QNode *parent = 0);
 
     void copy(const QNode *ref) Q_DECL_OVERRIDE;
 
@@ -80,7 +80,7 @@ public:
      * @param root - the found Scene or NULL if no Scene was found
      * @return
      */
-    static QAbstractScene* findInTree(QNode* root);
+    static QAbstractSceneLoader* findInTree(QNode* root);
 Q_SIGNALS:
 
     void sourceChanged(QString arg);
@@ -88,8 +88,8 @@ Q_SIGNALS:
 
 protected:
     void rebuild();
-    Q_DECLARE_PRIVATE(QAbstractScene)
-    QAbstractScene(QAbstractScenePrivate &dd, QNode *parent = 0);
+    Q_DECLARE_PRIVATE(QAbstractSceneLoader)
+    QAbstractSceneLoader(QAbstractSceneLoaderPrivate &dd, QNode *parent = 0);
 };
 
 } // Render
diff --git a/src/render/frontend/qabstractscene_p.h b/src/render/frontend/qabstractsceneloader_p.h
index 6508c4f2c..3d8c22350 100644
--- a/src/render/frontend/qabstractscene_p.h
+++ b/src/render/frontend/qabstractsceneloader_p.h
@@ -53,14 +53,14 @@ class AbstractSceneParser;
 
 namespace Render {
 
-class QAbstractScene;
+class QAbstractSceneLoader;
 
-class QT3DRENDERERSHARED_EXPORT QAbstractScenePrivate : public QComponentPrivate
+class QT3DRENDERERSHARED_EXPORT QAbstractSceneLoaderPrivate : public QComponentPrivate
 {
 public:
-    QAbstractScenePrivate(QAbstractScene *qq);
+    QAbstractSceneLoaderPrivate(QAbstractSceneLoader *qq);
 
-    Q_DECLARE_PUBLIC(QAbstractScene)
+    Q_DECLARE_PUBLIC(QAbstractSceneLoader)
 
     QString m_source;
     QString m_sceneId;
diff --git a/src/render/frontend/qscene.cpp b/src/render/frontend/qscene.cpp
index 383e750f9..91dafc528 100644
--- a/src/render/frontend/qscene.cpp
+++ b/src/render/frontend/qscene.cpp
@@ -46,7 +46,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3D {
 
 QScene::QScene(QNode *parent)
-    : Render::QAbstractScene(parent)
+    : Render::QAbstractSceneLoader(parent)
 {
 }
 
diff --git a/src/render/frontend/qscene.h b/src/render/frontend/qscene.h
index 905a93650..b402ae7b0 100644
--- a/src/render/frontend/qscene.h
+++ b/src/render/frontend/qscene.h
@@ -42,13 +42,13 @@
 #ifndef QT3D_QSCENE_H
 #define QT3D_QSCENE_H
 
-#include <Qt3DRenderer/qabstractscene.h>
+#include <Qt3DRenderer/qabstractsceneloader.h>
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3D {
 
-class QT3DRENDERERSHARED_EXPORT QScene : public Render::QAbstractScene
+class QT3DRENDERERSHARED_EXPORT QScene : public Render::QAbstractSceneLoader
 {
     Q_OBJECT
 public:
diff --git a/src/render/frontend/render-frontend.pri b/src/render/frontend/render-frontend.pri
index e99fc0cc3..15c90be5d 100644
--- a/src/render/frontend/render-frontend.pri
+++ b/src/render/frontend/render-frontend.pri
@@ -14,7 +14,7 @@ HEADERS += \
     $$PWD/qitemmodelbuffer.h \
     $$PWD/qtexture.h \
     $$PWD/sphere.h \
-    $$PWD/qabstractscene.h \
+    $$PWD/qabstractsceneloader.h \
     $$PWD/qeffect.h \
     $$PWD/qscene.h \
     $$PWD/qcriterion.h \
@@ -37,7 +37,7 @@ HEADERS += \
     $$PWD/qmaterial_p.h \
     $$PWD/qeffect_p.h \
     $$PWD/qtechnique_p.h \
-    $$PWD/qabstractscene_p.h \
+    $$PWD/qabstractsceneloader_p.h \
     $$PWD/qrenderpass_p.h \
     $$PWD/qlayer.h \
     $$PWD/qlayer_p.h \
@@ -73,7 +73,7 @@ SOURCES += \
     $$PWD/qitemmodelbuffer.cpp \
     $$PWD/qtexture.cpp \
     $$PWD/sphere.cpp \
-    $$PWD/qabstractscene.cpp \
+    $$PWD/qabstractsceneloader.cpp \
     $$PWD/qeffect.cpp \
     $$PWD/qscene.cpp \
     $$PWD/qcriterion.cpp \