Rename RenderShaderData -> ShaderData

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

2 files changed, 7 insertions, 7 deletions

diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp
index 12b814e68..e083fe485 100644
--- a/tests/auto/render/entity/tst_entity.cpp
+++ b/tests/auto/render/entity/tst_entity.cpp
@@ -63,7 +63,7 @@ QNodeId materialUuid(Entity *entity) { return entity->componentUuid<Material>();
 QNodeId geometryRendererUuid(Entity *entity) { return entity->componentUuid<GeometryRenderer>(); }
 
 QList<QNodeId> layersUuid(Entity *entity) { return entity->componentsUuid<Layer>(); }
-QList<QNodeId> shadersUuid(Entity *entity) { return entity->componentsUuid<RenderShaderData>(); }
+QList<QNodeId> shadersUuid(Entity *entity) { return entity->componentsUuid<ShaderData>(); }
 
 class tst_RenderEntity : public QObject
 {
diff --git a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
index 87a8a36de..ca02b3166 100644
--- a/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
+++ b/tests/auto/render/renderviewutils/tst_renderviewutils.cpp
@@ -37,7 +37,7 @@
 #include <QtTest/QTest>
 
 #include <Qt3DRenderer/private/renderviewjobutils_p.h>
-#include <Qt3DRenderer/private/rendershaderdata_p.h>
+#include <Qt3DRenderer/private/shaderdata_p.h>
 #include <Qt3DRenderer/private/managers_p.h>
 #include <Qt3DRenderer/qshaderdata.h>
 
@@ -287,7 +287,7 @@ void initBackendShaderData(Qt3DRender::QShaderData *frontend,
     }
 
     // Create backend element for frontend one
-    Qt3DRender::Render::RenderShaderData *backend = manager->getOrCreateResource(frontend->id());
+    Qt3DRender::Render::ShaderData *backend = manager->getOrCreateResource(frontend->id());
     // Init the backend element
     backend->updateFromPeer(frontend);
 }
@@ -303,7 +303,7 @@ void tst_RenderViewUtils::topLevelScalarValueNoUniforms()
     shaderData->setScalar(883.0f);
     initBackendShaderData(shaderData.data(), manager.data());
 
-    Qt3DRender::Render::RenderShaderData *backendShaderData = manager->lookupResource(shaderData->id());
+    Qt3DRender::Render::ShaderData *backendShaderData = manager->lookupResource(shaderData->id());
     QVERIFY(backendShaderData != Q_NULLPTR);
 
     Qt3DRender::Render::UniformBlockValueBuilder blockBuilder;
@@ -323,7 +323,7 @@ void tst_RenderViewUtils::topLevelScalarValue()
     shaderData->setScalar(883.0f);
     initBackendShaderData(shaderData.data(), manager.data());
 
-    Qt3DRender::Render::RenderShaderData *backendShaderData = manager->lookupResource(shaderData->id());
+    Qt3DRender::Render::ShaderData *backendShaderData = manager->lookupResource(shaderData->id());
     QVERIFY(backendShaderData != Q_NULLPTR);
 
     Qt3DRender::Render::UniformBlockValueBuilder blockBuilder;
@@ -355,7 +355,7 @@ void tst_RenderViewUtils::topLevelArrayValue()
     shaderData->setArray(arrayValues);
     initBackendShaderData(shaderData.data(), manager.data());
 
-    Qt3DRender::Render::RenderShaderData *backendShaderData = manager->lookupResource(shaderData->id());
+    Qt3DRender::Render::ShaderData *backendShaderData = manager->lookupResource(shaderData->id());
     QVERIFY(backendShaderData != Q_NULLPTR);
 
     Qt3DRender::Render::UniformBlockValueBuilder blockBuilder;
@@ -418,7 +418,7 @@ void tst_RenderViewUtils::topLevelStructValue()
 
     initBackendShaderData(shaderData, manager.data());
 
-    Qt3DRender::Render::RenderShaderData *backendShaderData = manager->lookupResource(shaderData->id());
+    Qt3DRender::Render::ShaderData *backendShaderData = manager->lookupResource(shaderData->id());
     QVERIFY(backendShaderData != Q_NULLPTR);
 
     Qt3DRender::Render::UniformBlockValueBuilder blockBuilder;