Rename RenderParameterMapping -> ParameterMapping

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

6 files changed, 27 insertions, 27 deletions

diff --git a/src/render/backend/renderparametermapping.cpp b/src/render/backend/parametermapping.cpp
index 62cb16dcf..a05d11b66 100644
--- a/src/render/backend/renderparametermapping.cpp
+++ b/src/render/backend/parametermapping.cpp
@@ -34,19 +34,19 @@
 **
 ****************************************************************************/
 
-#include "renderparametermapping_p.h"
+#include "parametermapping_p.h"
 
 QT_BEGIN_NAMESPACE
 
 namespace Qt3DRender {
 namespace Render {
 
-RenderParameterMapping::RenderParameterMapping()
+ParameterMapping::ParameterMapping()
     : m_bindingType(QParameterMapping::Uniform)
 {
 }
 
-RenderParameterMapping::RenderParameterMapping(QParameterMapping *mapping)
+ParameterMapping::ParameterMapping(QParameterMapping *mapping)
     : m_id(mapping ? mapping->id() : Qt3D::QNodeId())
     , m_parameterName(mapping ? mapping->parameterName() : QString())
     , m_shaderVariableName(mapping ? mapping->shaderVariableName() : QString())
@@ -54,27 +54,27 @@ RenderParameterMapping::RenderParameterMapping(QParameterMapping *mapping)
 {
 }
 
-bool RenderParameterMapping::isValid() const
+bool ParameterMapping::isValid() const
 {
     return !m_id.isNull();
 }
 
-Qt3D::QNodeId RenderParameterMapping::id() const
+Qt3D::QNodeId ParameterMapping::id() const
 {
     return m_id;
 }
 
-QString RenderParameterMapping::parameterName() const
+QString ParameterMapping::parameterName() const
 {
     return m_parameterName;
 }
 
-QString RenderParameterMapping::shaderVariableName() const
+QString ParameterMapping::shaderVariableName() const
 {
     return m_shaderVariableName;
 }
 
-QParameterMapping::Binding RenderParameterMapping::bindingType() const
+QParameterMapping::Binding ParameterMapping::bindingType() const
 {
     return m_bindingType;
 }
diff --git a/src/render/backend/renderparametermapping_p.h b/src/render/backend/parametermapping_p.h
index fe5b85a91..ead8baf9a 100644
--- a/src/render/backend/renderparametermapping_p.h
+++ b/src/render/backend/parametermapping_p.h
@@ -34,8 +34,8 @@
 **
 ****************************************************************************/
 
-#ifndef QT3DRENDER_RENDER_RENDERPARAMETERMAPPING_P_H
-#define QT3DRENDER_RENDER_RENDERPARAMETERMAPPING_P_H
+#ifndef QT3DRENDER_RENDER_PARAMETERMAPPING_P_H
+#define QT3DRENDER_RENDER_PARAMETERMAPPING_P_H
 
 #include <Qt3DRenderer/qparametermapping.h>
 
@@ -45,11 +45,11 @@ namespace Qt3DRender {
 
 namespace Render {
 
-class Q_AUTOTEST_EXPORT RenderParameterMapping
+class Q_AUTOTEST_EXPORT ParameterMapping
 {
 public:
-    RenderParameterMapping();
-    RenderParameterMapping(QParameterMapping *mapping);
+    ParameterMapping();
+    ParameterMapping(QParameterMapping *mapping);
 
     bool isValid() const;
 
@@ -71,4 +71,4 @@ private:
 
 QT_END_NAMESPACE
 
-#endif // QT3DRENDER_RENDER_RENDERPARAMETERMAPPING_P_H
+#endif // QT3DRENDER_RENDER_PARAMETERMAPPING_P_H
diff --git a/src/render/backend/render-backend.pri b/src/render/backend/render-backend.pri
index 1c96e938c..eaaf585ed 100644
--- a/src/render/backend/render-backend.pri
+++ b/src/render/backend/render-backend.pri
@@ -41,7 +41,6 @@ HEADERS += \
     $$PWD/handle_types_p.h \
     $$PWD/platformsurfacefilter_p.h \
     $$PWD/rendershaderdata_p.h \
-    $$PWD/renderparametermapping_p.h \
     $$PWD/rendertextureimage_p.h \
     $$PWD/vsyncframeadvanceservice_p.h \
     $$PWD/buffer_p.h \
@@ -60,7 +59,8 @@ HEADERS += \
     $$PWD/layer_p.h \
     $$PWD/material_p.h \
     $$PWD/nodefunctor_p.h \
-    $$PWD/parameter_p.h
+    $$PWD/parameter_p.h \
+    $$PWD/parametermapping_p.h
 
 SOURCES += \
     $$PWD/qrenderaspect.cpp \
@@ -93,7 +93,6 @@ SOURCES += \
     $$PWD/attachmentpack.cpp \
     $$PWD/platformsurfacefilter.cpp \
     $$PWD/rendershaderdata.cpp \
-    $$PWD/renderparametermapping.cpp \
     $$PWD/rendertextureimage.cpp \
     $$PWD/buffermanager.cpp \
     $$PWD/geometryrenderermanager.cpp \
@@ -109,4 +108,5 @@ SOURCES += \
     $$PWD/geometryrenderer.cpp \
     $$PWD/layer.cpp \
     $$PWD/material.cpp \
-    $$PWD/parameter.cpp
+    $$PWD/parameter.cpp \
+    $$PWD/parametermapping.cpp
diff --git a/src/render/backend/renderrenderpass.cpp b/src/render/backend/renderrenderpass.cpp
index af800d223..7c49c99c3 100644
--- a/src/render/backend/renderrenderpass.cpp
+++ b/src/render/backend/renderrenderpass.cpp
@@ -80,7 +80,7 @@ void RenderRenderPass::updateFromPeer(Qt3D::QNode *peer)
     // The RenderPass clones frontend bindings in case the frontend ever removes them
     // TO DO: We probably need a QParameterMapper manager
     Q_FOREACH (QParameterMapping *binding, pass->bindings())
-        appendBinding(RenderParameterMapping(binding));
+        appendBinding(ParameterMapping(binding));
     Q_FOREACH (QAnnotation *c, pass->annotations())
         appendAnnotation(c->id());
     Q_FOREACH (QRenderState *renderState, pass->renderStates())
@@ -100,7 +100,7 @@ void RenderRenderPass::sceneChangeEvent(const Qt3D::QSceneChangePtr &e)
         } else if (propertyChange->propertyName() == QByteArrayLiteral("shaderProgram")) {
             m_shaderUuid = propertyChange->value().value<QNodeId>();
         } else if (propertyChange->propertyName() == QByteArrayLiteral("binding")) {
-            appendBinding(RenderParameterMapping(propertyChange->value().value<QParameterMapping *>()));
+            appendBinding(ParameterMapping(propertyChange->value().value<QParameterMapping *>()));
         } else if (propertyChange->propertyName() == QByteArrayLiteral("renderState")) {
             QNodePtr nodePtr = propertyChange->value().value<QNodePtr>();
             QRenderState *renderState = static_cast<QRenderState *>(nodePtr.data());
@@ -136,7 +136,7 @@ Qt3D::QNodeId RenderRenderPass::shaderProgram() const
     return m_shaderUuid;
 }
 
-QList<RenderParameterMapping> RenderRenderPass::bindings() const
+QList<ParameterMapping> RenderRenderPass::bindings() const
 {
     return m_bindings.values();
 }
@@ -167,7 +167,7 @@ void RenderRenderPass::removeAnnotation(const Qt3D::QNodeId &annotationId)
     m_annotationList.removeOne(annotationId);
 }
 
-void RenderRenderPass::appendBinding(const RenderParameterMapping &binding)
+void RenderRenderPass::appendBinding(const ParameterMapping &binding)
 {
     if (!m_bindings.contains(binding.id()))
         m_bindings[binding.id()] = binding;
diff --git a/src/render/backend/renderrenderpass_p.h b/src/render/backend/renderrenderpass_p.h
index b36c09f5a..604ae6c1d 100644
--- a/src/render/backend/renderrenderpass_p.h
+++ b/src/render/backend/renderrenderpass_p.h
@@ -39,7 +39,7 @@
 #define QT3DRENDER_RENDER_RENDERRENDERPASS_H
 
 #include <Qt3DRenderer/qt3drenderer_global.h>
-#include <Qt3DRenderer/private/renderparametermapping_p.h>
+#include <Qt3DRenderer/private/parametermapping_p.h>
 #include <Qt3DRenderer/private/parameterpack_p.h>
 #include <Qt3DCore/private/qabstractaspect_p.h>
 #include <Qt3DCore/qbackendnode.h>
@@ -72,7 +72,7 @@ public:
     void sceneChangeEvent(const Qt3D::QSceneChangePtr &e) Q_DECL_OVERRIDE;
 
     Qt3D::QNodeId shaderProgram() const;
-    QList<RenderParameterMapping> bindings() const;
+    QList<ParameterMapping> bindings() const;
     QList<Qt3D::QNodeId> annotations() const;
     QList<RenderState *> renderStates() const;
     QList<Qt3D::QNodeId> parameters() const;
@@ -81,14 +81,14 @@ private:
     void appendAnnotation(const Qt3D::QNodeId &criterionId);
     void removeAnnotation(const Qt3D::QNodeId &criterionId);
 
-    void appendBinding(const RenderParameterMapping &binding);
+    void appendBinding(const ParameterMapping &binding);
     void removeBinding(const Qt3D::QNodeId &bindingId);
 
     void appendRenderState(const Qt3D::QNodeId &id, RenderState *renderState);
     void removeRenderState(const Qt3D::QNodeId &renderStateId);
 
     Qt3D::QNodeId m_shaderUuid;
-    QHash<Qt3D::QNodeId, RenderParameterMapping> m_bindings;
+    QHash<Qt3D::QNodeId, ParameterMapping> m_bindings;
     QHash<Qt3D::QNodeId, RenderState *> m_renderStates;
     QList<Qt3D::QNodeId> m_annotationList;
     ParameterPack m_parameterPack;
diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index 397f8d59b..a103860bb 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -641,7 +641,7 @@ void RenderView::setShaderAndUniforms(RenderCommand *command, RenderRenderPass *
                 }
 
                 // Set uniforms and attributes explicitly binded
-                Q_FOREACH (const RenderParameterMapping &binding, rPass->bindings()) {
+                Q_FOREACH (const ParameterMapping &binding, rPass->bindings()) {
                     ParameterInfoList::iterator it = findParamInfo(&parameters, binding.parameterName());
                     if (it == parameters.end()) {
                         if (binding.bindingType() == QParameterMapping::Attribute