Prefer q_func() over direct access to q_ptr

Similarly to d_ptr/d_func(), q_ptr should be accessed from the base class,
whilst q_func() is a Qt'ish way to access it from subclasses.

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

7 files changed, 7 insertions, 7 deletions

diff --git a/src/render/defaults/qdiffusemapmaterial.cpp b/src/render/defaults/qdiffusemapmaterial.cpp
index 63612b6c4..a32cb3c3a 100644
--- a/src/render/defaults/qdiffusemapmaterial.cpp
+++ b/src/render/defaults/qdiffusemapmaterial.cpp
@@ -121,7 +121,7 @@ void QDiffuseMapMaterialPrivate::init()
     m_diffuseMapEffect->addParameter(m_lightIntensityParameter);
     m_diffuseMapEffect->addParameter(m_textureScaleParameter);
 
-    static_cast<QMaterial *>(q_ptr)->setEffect(m_diffuseMapEffect);
+    q_func()->setEffect(m_diffuseMapEffect);
 }
 
 /*!
diff --git a/src/render/defaults/qdiffusespecularmapmaterial.cpp b/src/render/defaults/qdiffusespecularmapmaterial.cpp
index 71eefa9d4..7420ddea0 100644
--- a/src/render/defaults/qdiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qdiffusespecularmapmaterial.cpp
@@ -129,7 +129,7 @@ void QDiffuseSpecularMapMaterialPrivate::init()
     m_diffuseSpecularMapEffect->addParameter(m_lightIntensityParameter);
     m_diffuseSpecularMapEffect->addParameter(m_textureScaleParameter);
 
-    static_cast<QMaterial *>(q_ptr)->setEffect(m_diffuseSpecularMapEffect);
+    q_func()->setEffect(m_diffuseSpecularMapEffect);
 }
 
 /*!
diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
index 66a78fed6..4f94893bc 100644
--- a/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapalphamaterial.cpp
@@ -116,7 +116,7 @@ void QNormalDiffuseMapAlphaMaterialPrivate::init()
     m_normalDiffuseEffect->addParameter(m_lightIntensityParameter);
     m_normalDiffuseEffect->addParameter(m_textureScaleParameter);
 
-    static_cast<QMaterial *>(q_ptr)->setEffect(m_normalDiffuseEffect);
+    q_func()->setEffect(m_normalDiffuseEffect);
 }
 
 
diff --git a/src/render/defaults/qnormaldiffusemapmaterial.cpp b/src/render/defaults/qnormaldiffusemapmaterial.cpp
index cde3145f9..ce5565020 100644
--- a/src/render/defaults/qnormaldiffusemapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusemapmaterial.cpp
@@ -130,7 +130,7 @@ void QNormalDiffuseMapMaterialPrivate::init()
     m_normalDiffuseEffect->addParameter(m_lightIntensityParameter);
     m_normalDiffuseEffect->addParameter(m_textureScaleParameter);
 
-    static_cast<QMaterial *>(q_ptr)->setEffect(m_normalDiffuseEffect);
+    q_func()->setEffect(m_normalDiffuseEffect);
 }
 
 /*!
diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
index b37ffa7aa..9a9342db3 100644
--- a/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
+++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.cpp
@@ -136,7 +136,7 @@ void QNormalDiffuseSpecularMapMaterialPrivate::init()
     m_normalDiffuseSpecularEffect->addParameter(m_lightIntensityParameter);
     m_normalDiffuseSpecularEffect->addParameter(m_textureScaleParameter);
 
-    static_cast<QMaterial *>(q_ptr)->setEffect(m_normalDiffuseSpecularEffect);
+    q_func()->setEffect(m_normalDiffuseSpecularEffect);
 }
 
 /*!
diff --git a/src/render/defaults/qpervertexcolormaterial.cpp b/src/render/defaults/qpervertexcolormaterial.cpp
index a86940a2d..e2bc66f86 100644
--- a/src/render/defaults/qpervertexcolormaterial.cpp
+++ b/src/render/defaults/qpervertexcolormaterial.cpp
@@ -144,7 +144,7 @@ void QPerVertexColorMaterialPrivate::init()
     m_vertexEffect->addParameter(m_lightPositionParameter);
     m_vertexEffect->addParameter(m_lightIntensityParameter);
 
-    static_cast<QMaterial *>(q_ptr)->setEffect(m_vertexEffect);
+    q_func()->setEffect(m_vertexEffect);
 }
 
 } // Qt3D
diff --git a/src/render/defaults/qphongmaterial.cpp b/src/render/defaults/qphongmaterial.cpp
index b76597a9c..a6e336776 100644
--- a/src/render/defaults/qphongmaterial.cpp
+++ b/src/render/defaults/qphongmaterial.cpp
@@ -246,7 +246,7 @@ void QPhongMaterialPrivate::init()
     m_phongEffect->addParameter(m_lightPositionParameter);
     m_phongEffect->addParameter(m_lightIntensityParameter);
 
-    static_cast<QMaterial *>(q_ptr)->setEffect(m_phongEffect);
+    q_func()->setEffect(m_phongEffect);
 }
 
 } // Qt3D