Rename RenderGeometry -> Geometry

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

11 files changed, 37 insertions, 37 deletions

diff --git a/src/render/backend/rendergeometry.cpp b/src/render/backend/geometry.cpp
index 983dd5915..320d357e0 100644
--- a/src/render/backend/rendergeometry.cpp
+++ b/src/render/backend/geometry.cpp
@@ -34,7 +34,7 @@
 **
 ****************************************************************************/
 
-#include "rendergeometry_p.h"
+#include "geometry_p.h"
 #include <Qt3DCore/qscenepropertychange.h>
 #include <Qt3DCore/qabstractattribute.h>
 #include <Qt3DRenderer/qgeometry.h>
@@ -46,25 +46,25 @@ using namespace Qt3D;
 namespace Qt3DRender {
 namespace Render {
 
-RenderGeometry::RenderGeometry()
+Geometry::Geometry()
     : QBackendNode(ReadOnly)
     , m_verticesPerPatch(0)
     , m_geometryDirty(false)
 {
 }
 
-RenderGeometry::~RenderGeometry()
+Geometry::~Geometry()
 {
 }
 
-void RenderGeometry::cleanup()
+void Geometry::cleanup()
 {
     m_verticesPerPatch = 0;
     m_attributes.clear();
     m_geometryDirty = false;
 }
 
-void RenderGeometry::updateFromPeer(Qt3D::QNode *peer)
+void Geometry::updateFromPeer(Qt3D::QNode *peer)
 {
     QGeometry *geometry = static_cast<QGeometry *>(peer);
     if (geometry != Q_NULLPTR) {
@@ -76,7 +76,7 @@ void RenderGeometry::updateFromPeer(Qt3D::QNode *peer)
     }
 }
 
-void RenderGeometry::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
+void Geometry::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
 {
     QScenePropertyChangePtr propertyChange = qSharedPointerCast<QScenePropertyChange>(e);
     QByteArray propertyName = propertyChange->propertyName();
@@ -112,7 +112,7 @@ void RenderGeometry::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
     }
 }
 
-void RenderGeometry::unsetDirty()
+void Geometry::unsetDirty()
 {
     m_geometryDirty = false;
 }
diff --git a/src/render/backend/rendergeometry_p.h b/src/render/backend/geometry_p.h
index 48eb53724..2e91d944b 100644
--- a/src/render/backend/rendergeometry_p.h
+++ b/src/render/backend/geometry_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_RENDERGEOMETRY_H
-#define QT3DRENDER_RENDER_RENDERGEOMETRY_H
+#ifndef QT3DRENDER_RENDER_GEOMETRY_H
+#define QT3DRENDER_RENDER_GEOMETRY_H
 
 #include <Qt3DCore/qbackendnode.h>
 
@@ -46,11 +46,11 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class Q_AUTOTEST_EXPORT RenderGeometry : public Qt3D::QBackendNode
+class Q_AUTOTEST_EXPORT Geometry : public Qt3D::QBackendNode
 {
 public:
-    RenderGeometry();
-    ~RenderGeometry();
+    Geometry();
+    ~Geometry();
 
     void cleanup();
 
@@ -74,4 +74,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_RENDERGEOMETRY_H
+#endif // QT3DRENDER_RENDER_GEOMETRY_H
diff --git a/src/render/backend/handle_types_p.h b/src/render/backend/handle_types_p.h
index 29bea163d..1e324cd0b 100644
--- a/src/render/backend/handle_types_p.h
+++ b/src/render/backend/handle_types_p.h
@@ -71,7 +71,7 @@ class RenderShaderData;
 class RenderTextureImage;
 class Buffer;
 class Attribute;
-class RenderGeometry;
+class Geometry;
 class RenderGeometryRenderer;
 
 typedef Qt3D::QHandle<RenderAttachment, 16> HAttachment;
@@ -98,7 +98,7 @@ typedef Qt3D::QHandle<RenderShaderData, 16> HShaderData;
 typedef Qt3D::QHandle<RenderTextureImage, 16> HTextureImage;
 typedef Qt3D::QHandle<Buffer, 16> HBuffer;
 typedef Qt3D::QHandle<Attribute, 16> HAttribute;
-typedef Qt3D::QHandle<RenderGeometry, 16> HGeometry;
+typedef Qt3D::QHandle<Geometry, 16> HGeometry;
 typedef Qt3D::QHandle<RenderGeometryRenderer, 16> HGeometryRenderer;
 
 } // namespace Render
diff --git a/src/render/backend/managers_p.h b/src/render/backend/managers_p.h
index 6fdb0d8b9..5c76c136a 100644
--- a/src/render/backend/managers_p.h
+++ b/src/render/backend/managers_p.h
@@ -58,7 +58,7 @@
 #include <Qt3DRenderer/private/uniformbuffer_p.h>
 #include <Qt3DRenderer/private/rendertextureimage_p.h>
 #include <Qt3DRenderer/private/attribute_p.h>
-#include <Qt3DRenderer/private/rendergeometry_p.h>
+#include <Qt3DRenderer/private/geometry_p.h>
 
 QT_BEGIN_NAMESPACE
 
@@ -291,7 +291,7 @@ class AttributeManager : public Qt3D::QResourceManager<
 };
 
 class GeometryManager : public Qt3D::QResourceManager<
-        RenderGeometry,
+        Geometry,
         Qt3D::QNodeId,
         16,
         Qt3D::ArrayAllocatingPolicy,
@@ -315,7 +315,7 @@ Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTexture, Q_REQUIRES_CLEANUP)
 Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderRenderPass, Q_REQUIRES_CLEANUP)
 Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderTextureImage, Q_REQUIRES_CLEANUP)
 Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Attribute, Q_REQUIRES_CLEANUP)
-Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::RenderGeometry, Q_REQUIRES_CLEANUP)
+Q_DECLARE_RESOURCE_INFO(Qt3DRender::Render::Geometry, Q_REQUIRES_CLEANUP)
 
 QT_END_NAMESPACE
 
diff --git a/src/render/backend/qrenderaspect.cpp b/src/render/backend/qrenderaspect.cpp
index e55a208d3..c21001286 100644
--- a/src/render/backend/qrenderaspect.cpp
+++ b/src/render/backend/qrenderaspect.cpp
@@ -97,7 +97,7 @@
 #include <Qt3DRenderer/private/vsyncframeadvanceservice_p.h>
 #include <Qt3DRenderer/private/attribute_p.h>
 #include <Qt3DRenderer/private/buffer_p.h>
-#include <Qt3DRenderer/private/rendergeometry_p.h>
+#include <Qt3DRenderer/private/geometry_p.h>
 #include <Qt3DRenderer/private/rendergeometryrenderer_p.h>
 #include <Qt3DCore/qentity.h>
 #include <Qt3DCore/qtransform.h>
@@ -233,7 +233,7 @@ void QRenderAspect::registerBackendTypes()
     registerBackendType<QNoDraw>(QBackendNodeFunctorPtr(new Render::FrameGraphNodeFunctor<Render::NoDraw, QNoDraw>(d->m_renderer->frameGraphManager())));
     registerBackendType<QBuffer>(QBackendNodeFunctorPtr(new Render::BufferFunctor(d->m_renderer->bufferManager())));
     registerBackendType<QAttribute>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::Attribute, Render::AttributeManager>(d->m_renderer->attributeManager())));
-    registerBackendType<QGeometry>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::RenderGeometry, Render::GeometryManager>(d->m_renderer->geometryManager())));
+    registerBackendType<QGeometry>(QBackendNodeFunctorPtr(new Render::RenderNodeFunctor<Render::Geometry, Render::GeometryManager>(d->m_renderer->geometryManager())));
     registerBackendType<QGeometryRenderer>(QBackendNodeFunctorPtr(new Render::RenderGeometryRendererFunctor(d->m_renderer->geometryRendererManager())));
 }
 
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index 1cdda2579..a66101313 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -49,7 +49,6 @@ HEADERS += \
     $$PWD/rendertextureimage_p.h \
     $$PWD/vsyncframeadvanceservice_p.h \
     $$PWD/buffer_p.h \
-    $$PWD/rendergeometry_p.h \
     $$PWD/rendergeometryrenderer_p.h \
     $$PWD/buffermanager_p.h \
     $$PWD/geometryrenderermanager_p.h \
@@ -60,7 +59,8 @@ HEADERS += \
     $$PWD/buffer_p.h \
     $$PWD/cameralens_p.h \
     $$PWD/effect_p.h \
-    $$PWD/entity_p.h
+    $$PWD/entity_p.h \
+    $$PWD/geometry_p.h
 
 SOURCES += \
     $$PWD/qrenderaspect.cpp \
@@ -98,7 +98,6 @@ SOURCES += \
     $$PWD/rendershaderdata.cpp \
     $$PWD/renderparametermapping.cpp \
     $$PWD/rendertextureimage.cpp \
-    $$PWD/rendergeometry.cpp \
     $$PWD/rendergeometryrenderer.cpp \
     $$PWD/buffermanager.cpp \
     $$PWD/geometryrenderermanager.cpp \
@@ -109,4 +108,5 @@ SOURCES += \
     $$PWD/buffer.cpp \
     $$PWD/cameralens.cpp \
     $$PWD/effect.cpp \
-    $$PWD/entity.cpp
+    $$PWD/entity.cpp \
+    $$PWD/geometry.cpp
diff --git a/src/render/backend/renderer.cpp b/src/render/backend/renderer.cpp
index 4fa39c15b..286307c27 100644
--- a/src/render/backend/renderer.cpp
+++ b/src/render/backend/renderer.cpp
@@ -841,7 +841,7 @@ void Renderer::executeCommands(const QVector<RenderCommand *> &commands)
     Q_FOREACH (RenderCommand *command, commands) {
 
         // Check if we have a valid GeometryRenderer + Geometry
-        RenderGeometry *rGeometry = m_geometryManager->data(command->m_geometry);
+        Geometry *rGeometry = m_geometryManager->data(command->m_geometry);
         RenderGeometryRenderer *rGeometryRenderer = m_geometryRendererManager->data(command->m_geometryRenderer);
         const bool hasGeometryRenderer = rGeometry != Q_NULLPTR && rGeometryRenderer != Q_NULLPTR && !rGeometry->attributes().isEmpty();
 
@@ -990,12 +990,12 @@ void Renderer::executeCommands(const QVector<RenderCommand *> &commands)
         attribute->unsetDirty();
     m_dirtyAttributes.clear();
 
-    Q_FOREACH (RenderGeometry *geometry, m_dirtyGeometry)
+    Q_FOREACH (Geometry *geometry, m_dirtyGeometry)
         geometry->unsetDirty();
     m_dirtyGeometry.clear();
 }
 
-Attribute *Renderer::updateBuffersAndAttributes(RenderGeometry *geometry, RenderCommand *command, GLsizei &count, bool forceUpdate)
+Attribute *Renderer::updateBuffersAndAttributes(Geometry *geometry, RenderCommand *command, GLsizei &count, bool forceUpdate)
 {
     Attribute *indexAttribute = Q_NULLPTR;
     uint estimatedCount = 0;
diff --git a/src/render/backend/renderer_p.h b/src/render/backend/renderer_p.h
index 21f9f85c9..06cb669ac 100644
--- a/src/render/backend/renderer_p.h
+++ b/src/render/backend/renderer_p.h
@@ -155,7 +155,7 @@ public:
     QVector<Qt3D::QAspectJobPtr> createGeometryRendererJobs();
     Qt3D::QAspectJobPtr createRenderViewJob(FrameGraphNode *node, int submitOrderIndex);
     void executeCommands(const QVector<RenderCommand *> &commands);
-    Attribute *updateBuffersAndAttributes(RenderGeometry *geometry, RenderCommand *command, GLsizei &count, bool forceUpdate);
+    Attribute *updateBuffersAndAttributes(Geometry *geometry, RenderCommand *command, GLsizei &count, bool forceUpdate);
     void addAllocator(Qt3D::QFrameAllocator *allocator);
 
     inline CameraManager *cameraManager() const { return m_cameraManager; }
@@ -291,7 +291,7 @@ private:
     QVector<Qt3D::QFrameAllocator *> m_allocators;
 
     QVector<Attribute *> m_dirtyAttributes;
-    QVector<RenderGeometry *> m_dirtyGeometry;
+    QVector<Geometry *> m_dirtyGeometry;
 };
 
 } // namespace Render
diff --git a/tests/auto/render/rendergeometry/rendergeometry.pro b/tests/auto/render/geometry/geometry.pro
index 7ca493242..9d4edb51e 100644
--- a/tests/auto/render/rendergeometry/rendergeometry.pro
+++ b/tests/auto/render/geometry/geometry.pro
@@ -1,9 +1,9 @@
 TEMPLATE = app
 
-TARGET = tst_rendergeometry
+TARGET = tst_geometry
 
 QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib
 
 CONFIG += testcase
 
-SOURCES += tst_rendergeometry.cpp
+SOURCES += tst_geometry.cpp
diff --git a/tests/auto/render/rendergeometry/tst_rendergeometry.cpp b/tests/auto/render/geometry/tst_geometry.cpp
index 0d1a3d0b3..dd99978ac 100644
--- a/tests/auto/render/rendergeometry/tst_rendergeometry.cpp
+++ b/tests/auto/render/geometry/tst_geometry.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include <QtTest/QTest>
-#include <Qt3DRenderer/private/rendergeometry_p.h>
+#include <Qt3DRenderer/private/geometry_p.h>
 #include <Qt3DRenderer/qgeometry.h>
 #include <Qt3DRenderer/qattribute.h>
 #include <Qt3DCore/qscenepropertychange.h>
@@ -48,7 +48,7 @@ private Q_SLOTS:
     void checkPeerPropertyMirroring()
     {
         // GIVEN
-        Qt3DRender::Render::RenderGeometry renderGeometry;
+        Qt3DRender::Render::Geometry renderGeometry;
 
         Qt3DRender::QGeometry geometry;
         Qt3DRender::QAttribute attr1;
@@ -78,7 +78,7 @@ private Q_SLOTS:
     void checkInitialAndCleanedUpState()
     {
         // GIVEN
-        Qt3DRender::Render::RenderGeometry renderGeometry;
+        Qt3DRender::Render::Geometry renderGeometry;
 
         // THEN
         QCOMPARE(renderGeometry.isDirty(), false);
@@ -112,7 +112,7 @@ private Q_SLOTS:
     void checkPropertyChanges()
     {
         // GIVEN
-        Qt3DRender::Render::RenderGeometry renderGeometry;
+        Qt3DRender::Render::Geometry renderGeometry;
         Qt3D::QNodeId geometryId = Qt3D::QNodeId::createId();
 
         // WHEN
@@ -156,4 +156,4 @@ private Q_SLOTS:
 
 QTEST_APPLESS_MAIN(tst_RenderGeometry)
 
-#include "tst_rendergeometry.moc"
+#include "tst_geometry.moc"
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index 59f53d013..c32046c9b 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -19,7 +19,7 @@ contains(QT_CONFIG, private_tests) {
         qgeometryrenderer \
         buffer \
         attribute \
-        rendergeometry \
+        geometry \
         rendergeometryrenderer \
         raycasting
 }