Use ms_ prefix for static members

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

2 files changed, 9 insertions, 9 deletions

diff --git a/src/render/backend/renderview.cpp b/src/render/backend/renderview.cpp
index 2036a977a..5f8a6d051 100644
--- a/src/render/backend/renderview.cpp
+++ b/src/render/backend/renderview.cpp
@@ -119,8 +119,8 @@ bool isEntityInLayers(const RenderEntity *entity, const QStringList &layers)
 
 } // anonymouse namespace
 
-RenderView::standardUniformsPFuncsHash RenderView::m_standardUniformSetters = RenderView::initializeStandardUniformSetters();
-QStringList RenderView::m_standardAttributesNames = RenderView::initializeStandardAttributeNames();
+RenderView::standardUniformsPFuncsHash RenderView::ms_standardUniformSetters = RenderView::initializeStandardUniformSetters();
+QStringList RenderView::ms_standardAttributesNames = RenderView::initializeStandardAttributeNames();
 
 RenderView::standardUniformsPFuncsHash RenderView::initializeStandardUniformSetters()
 {
@@ -718,14 +718,14 @@ void RenderView::setShaderAndUniforms(RenderCommand *command, RenderRenderPass *
 
                 // Set default standard uniforms without bindings
                 Q_FOREACH (const QString &uniformName, uniformNames) {
-                    if (m_standardUniformSetters.contains(uniformName))
+                    if (ms_standardUniformSetters.contains(uniformName))
                         command->m_uniforms.setUniform(uniformName,
-                                                       (this->*m_standardUniformSetters[uniformName])(worldTransform));
+                                                       (this->*ms_standardUniformSetters[uniformName])(worldTransform));
                 }
 
                 // Set default attributes
                 Q_FOREACH (const QString &attributeName, attributeNames) {
-                    if (m_standardAttributesNames.contains(attributeName))
+                    if (ms_standardAttributesNames.contains(attributeName))
                         command->m_parameterAttributeToShaderNames[attributeName] = attributeName;
                 }
 
@@ -737,9 +737,9 @@ void RenderView::setShaderAndUniforms(RenderCommand *command, RenderRenderPass *
                             command->m_parameterAttributeToShaderNames.insert(binding->parameterName(), binding->shaderVariableName());
                         else if (binding->bindingType() == QParameterMapping::StandardUniform
                                  && uniformNames.contains(binding->shaderVariableName())
-                                 && m_standardUniformSetters.contains(binding->parameterName()))
+                                 && ms_standardUniformSetters.contains(binding->parameterName()))
                             command->m_uniforms.setUniform(binding->shaderVariableName(),
-                                                           (this->*m_standardUniformSetters[binding->parameterName()])(worldTransform));
+                                                           (this->*ms_standardUniformSetters[binding->parameterName()])(worldTransform));
                         else if (binding->bindingType() == QParameterMapping::FragmentOutput && fragOutputs.contains(binding->parameterName()))
                             fragOutputs.insert(binding->shaderVariableName(), fragOutputs.take(binding->parameterName()));
                         else
diff --git a/src/render/backend/renderview_p.h b/src/render/backend/renderview_p.h
index 909ec680d..a15f1f354 100644
--- a/src/render/backend/renderview_p.h
+++ b/src/render/backend/renderview_p.h
@@ -158,9 +158,9 @@ private:
     QVector<RenderCommand *> m_commands;
 
     typedef QHash<QString, QUniformValue* (RenderView::*)(const QMatrix4x4& model) const> standardUniformsPFuncsHash;
-    static  standardUniformsPFuncsHash m_standardUniformSetters;
+    static  standardUniformsPFuncsHash ms_standardUniformSetters;
     static standardUniformsPFuncsHash initializeStandardUniformSetters();
-    static QStringList m_standardAttributesNames;
+    static QStringList ms_standardAttributesNames;
     static QStringList initializeStandardAttributeNames();
 
     QUniformValue *modelMatrix(const QMatrix4x4& model) const;