Rename RenderMaterial -> Material

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

4 files changed, 10 insertions, 10 deletions

diff --git a/tests/auto/render/entity/tst_entity.cpp b/tests/auto/render/entity/tst_entity.cpp
index 7d9cf63d8..12b814e68 100644
--- a/tests/auto/render/entity/tst_entity.cpp
+++ b/tests/auto/render/entity/tst_entity.cpp
@@ -59,7 +59,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 materialUuid(Entity *entity) { return entity->componentUuid<Material>(); }
 QNodeId geometryRendererUuid(Entity *entity) { return entity->componentUuid<GeometryRenderer>(); }
 
 QList<QNodeId> layersUuid(Entity *entity) { return entity->componentsUuid<Layer>(); }
diff --git a/tests/auto/render/rendermaterial/rendermaterial.pro b/tests/auto/render/material/material.pro
index 545510ae8..051b8f3e0 100644
--- a/tests/auto/render/rendermaterial/rendermaterial.pro
+++ b/tests/auto/render/material/material.pro
@@ -1,9 +1,9 @@
 TEMPLATE = app
 
-TARGET = tst_rendermaterial
+TARGET = tst_material
 
 QT += 3dcore 3dcore-private 3drenderer 3drenderer-private testlib
 
 CONFIG += testcase
 
-SOURCES += tst_rendermaterial.cpp
+SOURCES += tst_material.cpp
diff --git a/tests/auto/render/rendermaterial/tst_rendermaterial.cpp b/tests/auto/render/material/tst_material.cpp
index c4669630a..39be14e96 100644
--- a/tests/auto/render/rendermaterial/tst_rendermaterial.cpp
+++ b/tests/auto/render/material/tst_material.cpp
@@ -35,7 +35,7 @@
 ****************************************************************************/
 
 #include <QtTest/QTest>
-#include <Qt3DRenderer/private/rendermaterial_p.h>
+#include <Qt3DRenderer/private/material_p.h>
 
 #include <Qt3DRenderer/QMaterial>
 #include <Qt3DRenderer/QParameter>
@@ -65,7 +65,7 @@ private slots:
 void tst_RenderMaterial::shouldHaveInitialState()
 {
     // GIVEN
-    RenderMaterial backend;
+    Material backend;
 
     // THEN
     QVERIFY(backend.parameters().isEmpty());
@@ -116,7 +116,7 @@ void tst_RenderMaterial::shouldHavePropertiesMirroringFromItsPeer()
 {
     // WHEN
     QFETCH(QMaterial *, frontendMaterial);
-    RenderMaterial backend;
+    Material backend;
 
     // GIVEN
     backend.setPeer(frontendMaterial);
@@ -137,7 +137,7 @@ void tst_RenderMaterial::shouldHandleParametersPropertyChange()
 {
     // GIVEN
     QScopedPointer<QParameter> parameter(new QParameter());
-    RenderMaterial backend;
+    Material backend;
 
     // WHEN
     QScenePropertyChangePtr addChange(new QScenePropertyChange(NodeAdded, QSceneChange::Node, parameter->id()));
@@ -162,7 +162,7 @@ void tst_RenderMaterial::shouldHandleParametersPropertyChange()
 void tst_RenderMaterial::shouldHandleEnablePropertyChange()
 {
     // GIVEN
-    RenderMaterial backend;
+    Material backend;
 
     // WHEN
     QScenePropertyChangePtr updateChange(new QScenePropertyChange(NodeUpdated, QSceneChange::Node, QNodeId()));
@@ -185,4 +185,4 @@ void tst_RenderMaterial::shouldHandleEnablePropertyChange()
 
 QTEST_APPLESS_MAIN(tst_RenderMaterial)
 
-#include "tst_rendermaterial.moc"
+#include "tst_material.moc"
diff --git a/tests/auto/render/render.pro b/tests/auto/render/render.pro
index e6a037f11..03da795e5 100644
--- a/tests/auto/render/render.pro
+++ b/tests/auto/render/render.pro
@@ -9,7 +9,7 @@ contains(QT_CONFIG, private_tests) {
         rendershader \
         renderviewutils \
         renderviews \
-        rendermaterial \
+        material \
         vsyncframeadvanceservice \
         meshfunctors \
         qmaterial \