Rename RenderShaderData -> ShaderData

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

4 files changed, 15 insertions, 15 deletions

diff --git a/src/render/backend/jobs/framecleanupjob.cpp b/src/render/backend/jobs/framecleanupjob.cpp
index e0d9a876f..7d6df11b4 100644
--- a/src/render/backend/jobs/framecleanupjob.cpp
+++ b/src/render/backend/jobs/framecleanupjob.cpp
@@ -37,7 +37,7 @@
 #include "framecleanupjob_p.h"
 #include <private/renderer_p.h>
 #include <private/entity_p.h>
-#include <private/rendershaderdata_p.h>
+#include <private/shaderdata_p.h>
 #include <private/managers_p.h>
 #include <private/texturedatamanager_p.h>
 
@@ -57,13 +57,13 @@ FrameCleanupJob::~FrameCleanupJob()
 
 void FrameCleanupJob::run()
 {
-    // set each RenderShaderData to not need an update
-    Q_FOREACH (const Qt3D::QNodeId &id, RenderShaderData::updatedShaderDataList()) {
-        RenderShaderData *shaderData = m_renderer->shaderDataManager()->lookupResource(id);
+    // set each ShaderData to not need an update
+    Q_FOREACH (const Qt3D::QNodeId &id, ShaderData::updatedShaderDataList()) {
+        ShaderData *shaderData = m_renderer->shaderDataManager()->lookupResource(id);
         if (shaderData != Q_NULLPTR)
             shaderData->clearUpdate();
     }
-    RenderShaderData::clearShaderDataList();
+    ShaderData::clearShaderDataList();
 
     // Cleanup texture handles
     TextureDataManager *textureDataManager = m_renderer->textureDataManager();
diff --git a/src/render/backend/jobs/framepreparationjob.cpp b/src/render/backend/jobs/framepreparationjob.cpp
index 8ce0af720..8b98fb54d 100644
--- a/src/render/backend/jobs/framepreparationjob.cpp
+++ b/src/render/backend/jobs/framepreparationjob.cpp
@@ -37,7 +37,7 @@
 #include "framepreparationjob_p.h"
 #include <Qt3DRenderer/private/renderer_p.h>
 #include <Qt3DRenderer/private/entity_p.h>
-#include <Qt3DRenderer/private/rendershaderdata_p.h>
+#include <Qt3DRenderer/private/shaderdata_p.h>
 #include <Qt3DRenderer/sphere.h>
 
 QT_BEGIN_NAMESPACE
@@ -78,9 +78,9 @@ void FramePreparationJob::parseNodeTree(Entity *node)
         // TO DO: Make that work with the GeometryRenderer
     }
 
-    // Update transform properties in RenderShaderData
-    QList<RenderShaderData *> shadersData = node->renderComponents<RenderShaderData>();
-    Q_FOREACH (RenderShaderData *r, shadersData) {
+    // Update transform properties in ShaderData
+    QList<ShaderData *> shadersData = node->renderComponents<ShaderData>();
+    Q_FOREACH (ShaderData *r, shadersData) {
         r->updateTransformedProperties(*node->worldTransform());
     }
 
diff --git a/src/render/backend/jobs/renderviewjobutils.cpp b/src/render/backend/jobs/renderviewjobutils.cpp
index 9733da4e1..89010c6ec 100644
--- a/src/render/backend/jobs/renderviewjobutils.cpp
+++ b/src/render/backend/jobs/renderviewjobutils.cpp
@@ -55,7 +55,7 @@
 #include <Qt3DRenderer/private/viewportnode_p.h>
 #include <Qt3DRenderer/private/shadervariables_p.h>
 #include <Qt3DRenderer/private/managers_p.h>
-#include <Qt3DRenderer/private/rendershaderdata_p.h>
+#include <Qt3DRenderer/private/shaderdata_p.h>
 #include <Qt3DRenderer/private/statesetnode_p.h>
 
 QT_BEGIN_NAMESPACE
@@ -391,7 +391,7 @@ void UniformBlockValueBuilder::buildActiveUniformNameValueMapHelper(const QStrin
         if (list.at(0).userType() == qNodeIdTypeId) { // Array of struct qmlPropertyName[i].structMember
             for (int i = 0; i < list.size(); ++i) {
                 if (list.at(i).userType() == qNodeIdTypeId) {
-                    RenderShaderData *subShaderData = shaderDataManager->lookupResource(list.at(i).value<QNodeId>());
+                    ShaderData *subShaderData = shaderDataManager->lookupResource(list.at(i).value<QNodeId>());
                     if (subShaderData)
                         buildActiveUniformNameValueMapStructHelper(subShaderData,
                                                                    blockName + QStringLiteral(".") + qmlPropertyName + blockArray.arg(i),
@@ -406,7 +406,7 @@ void UniformBlockValueBuilder::buildActiveUniformNameValueMapHelper(const QStrin
             }
         }
     } else if (value.userType() == qNodeIdTypeId) { // Struct qmlPropertyName.structMember
-        RenderShaderData *rSubShaderData = shaderDataManager->lookupResource(value.value<QNodeId>());
+        ShaderData *rSubShaderData = shaderDataManager->lookupResource(value.value<QNodeId>());
         if (rSubShaderData)
             buildActiveUniformNameValueMapStructHelper(rSubShaderData,
                                                        blockName,
@@ -420,7 +420,7 @@ void UniformBlockValueBuilder::buildActiveUniformNameValueMapHelper(const QStrin
     }
 }
 
-void UniformBlockValueBuilder::buildActiveUniformNameValueMapStructHelper(RenderShaderData *rShaderData, const QString &blockName, const QString &qmlPropertyName)
+void UniformBlockValueBuilder::buildActiveUniformNameValueMapStructHelper(ShaderData *rShaderData, const QString &blockName, const QString &qmlPropertyName)
 {
     const QHash<QString, QVariant> &properties = updatedPropertiesOnly ? rShaderData->updatedProperties() : rShaderData->properties();
     QHash<QString, QVariant>::const_iterator it = properties.begin();
diff --git a/src/render/backend/jobs/renderviewjobutils_p.h b/src/render/backend/jobs/renderviewjobutils_p.h
index be62de3d2..8179ebc85 100644
--- a/src/render/backend/jobs/renderviewjobutils_p.h
+++ b/src/render/backend/jobs/renderviewjobutils_p.h
@@ -63,7 +63,7 @@ class RenderView;
 class Renderer;
 class ShaderDataManager;
 struct ShaderUniform;
-class RenderShaderData;
+class ShaderData;
 class RenderState;
 
 Q_AUTOTEST_EXPORT void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv,
@@ -129,7 +129,7 @@ struct Q_AUTOTEST_EXPORT UniformBlockValueBuilder
     void buildActiveUniformNameValueMapHelper(const QString &blockName,
                                               const QString &qmlPropertyName,
                                               const QVariant &value);
-    void buildActiveUniformNameValueMapStructHelper(RenderShaderData *rShaderData,
+    void buildActiveUniformNameValueMapStructHelper(ShaderData *rShaderData,
                                                     const QString &blockName,
                                                     const QString &qmlPropertyName = QString());