Rename RenderGeometryRenderer to GeometryRenderer

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

4 files changed, 9 insertions, 9 deletions

diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp
index c0370c4df..37e11d265 100644
--- a/tests/auto/render/entity/tst_entity.cpp
+++ b/tests/auto/render/entity/tst_entity.cpp
@@ -60,7 +60,7 @@ void noopDeleter(QNode *) {}
 QNodeId transformUuid(Entity *entity) { return entity->componentUuid<RenderTransform>(); }
 QNodeId cameraLensUuid(Entity *entity) { return entity->componentUuid<CameraLens>(); }
 QNodeId materialUuid(Entity *entity) { return entity->componentUuid<RenderMaterial>(); }
-QNodeId geometryRendererUuid(Entity *entity) { return entity->componentUuid<RenderGeometryRenderer>(); }
+QNodeId geometryRendererUuid(Entity *entity) { return entity->componentUuid<GeometryRenderer>(); }
 
 QList<QNodeId> layersUuid(Entity *entity) { return entity->componentsUuid<RenderLayer>(); }
 QList<QNodeId> shadersUuid(Entity *entity) { return entity->componentsUuid<RenderShaderData>(); }
diff --git a/tests/auto/render/rendergeometryrenderer/rendergeometryrenderer.pro b/tests/auto/render/geometryrenderer/geometryrenderer.pro
index 164a5365d..63ad16592 100644
--- a/tests/auto/render/rendergeometryrenderer/rendergeometryrenderer.pro
+++ b/tests/auto/render/geometryrenderer/geometryrenderer.pro
@@ -1,9 +1,9 @@
 TEMPLATE = app
 
-TARGET = tst_rendergeometryrenderer
+TARGET = tst_geometryrenderer
 
 QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib
 
 CONFIG += testcase
 
-SOURCES += tst_rendergeometryrenderer.cpp
+SOURCES += tst_geometryrenderer.cpp
diff --git a/tests/auto/render/rendergeometryrenderer/tst_rendergeometryrenderer.cpp b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
index ab0d917c9..13e67cf45 100644
--- a/tests/auto/render/rendergeometryrenderer/tst_rendergeometryrenderer.cpp
+++ b/tests/auto/render/geometryrenderer/tst_geometryrenderer.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include <QtTest/QTest>
-#include <Qt3DRenderer/private/rendergeometryrenderer_p.h>
+#include <Qt3DRenderer/private/geometryrenderer_p.h>
 #include <Qt3DRenderer/qgeometry.h>
 #include <Qt3DRenderer/qgeometryfunctor.h>
 #include <Qt3DCore/qscenepropertychange.h>
@@ -74,7 +74,7 @@ private Q_SLOTS:
     void checkPeerPropertyMirroring()
     {
         // GIVEN
-        Qt3DRender::Render::RenderGeometryRenderer renderGeometryRenderer;
+        Qt3DRender::Render::GeometryRenderer renderGeometryRenderer;
         Qt3DRender::QGeometryRenderer geometryRenderer;
         Qt3DRender::QGeometry geometry;
         Qt3DRender::QGeometryFunctorPtr functor(new TestFunctor(1200));
@@ -110,7 +110,7 @@ private Q_SLOTS:
     void checkInitialAndCleanedUpState()
     {
         // GIVEN
-        Qt3DRender::Render::RenderGeometryRenderer renderGeometryRenderer;
+        Qt3DRender::Render::GeometryRenderer renderGeometryRenderer;
 
         // THEN
         QVERIFY(renderGeometryRenderer.peerUuid().isNull());
@@ -162,7 +162,7 @@ private Q_SLOTS:
     void checkPropertyChanges()
     {
         // GIVEN
-        Qt3DRender::Render::RenderGeometryRenderer renderGeometryRenderer;
+        Qt3DRender::Render::GeometryRenderer renderGeometryRenderer;
 
         QVERIFY(!renderGeometryRenderer.isDirty());
 
@@ -302,4 +302,4 @@ private Q_SLOTS:
 
 QTEST_APPLESS_MAIN(tst_RenderGeometryRenderer)
 
-#include "tst_rendergeometryrenderer.moc"
+#include "tst_geometryrenderer.moc"
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index c32046c9b..e6a037f11 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -20,6 +20,6 @@ contains(QT_CONFIG, private_tests) {
         buffer \
         attribute \
         geometry \
-        rendergeometryrenderer \
+        geometryrenderer \
         raycasting
 }