Rename RenderScene -> Scene

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

6 files changed, 21 insertions, 21 deletions

diff --git a/src/render/backend/jobs/loadscenejob.cpp b/src/render/backend/jobs/loadscenejob.cpp
index bae7afcc2..6ceda73da 100644
--- a/src/render/backend/jobs/loadscenejob.cpp
+++ b/src/render/backend/jobs/loadscenejob.cpp
@@ -66,7 +66,7 @@ void LoadSceneJob::run()
         }
     }
     // set clone of sceneTree in sceneComponent
-    RenderScene *scene = m_renderer->sceneManager()->lookupResource(m_sceneComponent);
+    Scene *scene = m_renderer->sceneManager()->lookupResource(m_sceneComponent);
     scene->setSceneSubtree(sceneTree);
 }
 
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index 019007805..9b6c0e308 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -31,7 +31,6 @@ HEADERS += \
     $$PWD/renderstate_p.h \
     $$PWD/rendertarget_p.h \
     $$PWD/renderattachment_p.h \
-    $$PWD/renderscene_p.h \
     $$PWD/scenemanager_p.h \
     $$PWD/attachmentpack_p.h \
     $$PWD/shadervariables_p.h \
@@ -60,7 +59,8 @@ HEADERS += \
     $$PWD/nodefunctor_p.h \
     $$PWD/parameter_p.h \
     $$PWD/parametermapping_p.h \
-    $$PWD/renderpass_p.h
+    $$PWD/renderpass_p.h \
+    $$PWD/scene_p.h
 
 SOURCES += \
     $$PWD/qrenderaspect.cpp \
@@ -87,7 +87,6 @@ SOURCES += \
     $$PWD/renderstate.cpp \
     $$PWD/rendertarget.cpp \
     $$PWD/renderattachment.cpp \
-    $$PWD/renderscene.cpp \
     $$PWD/scenemanager.cpp \
     $$PWD/attachmentpack.cpp \
     $$PWD/platformsurfacefilter.cpp \
@@ -109,4 +108,5 @@ SOURCES += \
     $$PWD/material.cpp \
     $$PWD/parameter.cpp \
     $$PWD/parametermapping.cpp \
-    $$PWD/renderpass.cpp
+    $$PWD/renderpass.cpp \
+    $$PWD/scene.cpp
diff --git a/src/render/backend/renderscene.cpp b/src/render/backend/scene.cpp
index 4cea15b19..a92dc1fd8 100644
--- a/src/render/backend/renderscene.cpp
+++ b/src/render/backend/scene.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "renderscene_p.h"
+#include "scene_p.h"
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DCore/private/qscene_p.h>
@@ -49,13 +49,13 @@ using namespace Qt3D;
 namespace Qt3DRender {
 namespace Render {
 
-RenderScene::RenderScene()
+Scene::Scene()
     : QBackendNode(QBackendNode::ReadWrite)
     , m_sceneManager(Q_NULLPTR)
 {
 }
 
-void RenderScene::updateFromPeer(Qt3D::QNode *peer)
+void Scene::updateFromPeer(Qt3D::QNode *peer)
 {
     QAbstractSceneLoader *loader = static_cast<QAbstractSceneLoader *>(peer);
 
@@ -63,7 +63,7 @@ void RenderScene::updateFromPeer(Qt3D::QNode *peer)
     m_sceneManager->addSceneData(m_source, peerUuid());
 }
 
-void RenderScene::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Scene::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     if (propertyChange->propertyName() == QByteArrayLiteral("source")) {
@@ -72,12 +72,12 @@ void RenderScene::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
     }
 }
 
-QUrl RenderScene::source() const
+QUrl Scene::source() const
 {
     return m_source;
 }
 
-void RenderScene::setSceneSubtree(Qt3D::QEntity *subTree)
+void Scene::setSceneSubtree(Qt3D::QEntity *subTree)
 {
     QBackendScenePropertyChangePtr e(new QBackendScenePropertyChange(NodeUpdated, peerUuid()));
     e->setPropertyName("scene");
@@ -93,7 +93,7 @@ void RenderScene::setSceneSubtree(Qt3D::QEntity *subTree)
     notifyObservers(e2);
 }
 
-void RenderScene::setSceneManager(SceneManager *manager)
+void Scene::setSceneManager(SceneManager *manager)
 {
     if (m_sceneManager != manager)
         m_sceneManager = manager;
@@ -106,7 +106,7 @@ RenderSceneFunctor::RenderSceneFunctor(SceneManager *sceneManager)
 
 Qt3D::QBackendNode *RenderSceneFunctor::create(Qt3D::QNode *frontend, const Qt3D::QBackendNodeFactory *factory) const
 {
-    RenderScene *scene = m_sceneManager->getOrCreateResource(frontend->id());
+    Scene *scene = m_sceneManager->getOrCreateResource(frontend->id());
     scene->setFactory(factory);
     scene->setSceneManager(m_sceneManager);
     scene->setPeer(frontend);
diff --git a/src/render/backend/renderscene_p.h b/src/render/backend/scene_p.h
index c6a07a565..f69192cfa 100644
--- a/src/render/backend/renderscene_p.h
+++ b/src/render/backend/scene_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_RENDERSCENE_P_H
-#define QT3DRENDER_RENDER_RENDERSCENE_P_H
+#ifndef QT3DRENDER_RENDER_SCENE_P_H
+#define QT3DRENDER_RENDER_SCENE_P_H
 
 #include <QtGlobal>
 #include <Qt3DCore/qbackendnode.h>
@@ -52,10 +52,10 @@ namespace Render {
 
 class SceneManager;
 
-class RenderScene : public Qt3D::QBackendNode
+class Scene : public Qt3D::QBackendNode
 {
 public:
-    RenderScene();
+    Scene();
 
     void updateFromPeer(Qt3D::QNode *peer) Q_DECL_OVERRIDE;
 
@@ -87,4 +87,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_RENDERSCENE_P_H
+#endif // QT3DRENDER_RENDER_SCENE_P_H
diff --git a/src/render/backend/scenemanager.cpp b/src/render/backend/scenemanager.cpp
index ed1253226..52fd2a627 100644
--- a/src/render/backend/scenemanager.cpp
+++ b/src/render/backend/scenemanager.cpp
@@ -41,7 +41,7 @@ QT_BEGIN_NAMESPACE
 namespace Qt3DRender {
 namespace Render {
 
-SceneManager::SceneManager() : QResourceManager<RenderScene,
+SceneManager::SceneManager() : QResourceManager<Scene,
                                                 Qt3D::QNodeId,
                                                 8,
                                                 Qt3D::ArrayAllocatingPolicy,
diff --git a/src/render/backend/scenemanager_p.h b/src/render/backend/scenemanager_p.h
index 073737de2..889601db1 100644
--- a/src/render/backend/scenemanager_p.h
+++ b/src/render/backend/scenemanager_p.h
@@ -38,7 +38,7 @@
 #define QT3DRENDER_RENDER_SCENEMANAGER_P_H
 
 #include <Qt3DCore/private/qresourcemanager_p.h>
-#include <Qt3DRenderer/private/renderscene_p.h>
+#include <Qt3DRenderer/private/scene_p.h>
 #include <Qt3DCore/qnodeid.h>
 #include <Qt3DRenderer/private/loadscenejob_p.h>
 
@@ -51,7 +51,7 @@ class QEntity;
 namespace Qt3DRender {
 namespace Render {
 
-class SceneManager : public Qt3D::QResourceManager<RenderScene,
+class SceneManager : public Qt3D::QResourceManager<Scene,
                                              Qt3D::QNodeId,
                                              8,
                                              Qt3D::ArrayAllocatingPolicy,