diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2016-03-01 02:13:35 +0100 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2016-03-01 19:26:22 +0000 |
commit | 792fb7c40e33fa34d6039956c48dea4bd82bb8d1 (patch) | |
tree | 08002bd7d4ab4ce8e15604d7729b5721addf22df /src/render/defaults | |
parent | 7e4b3673ac571ce067e36e29d63f1fd4418bcfb7 (diff) |
Make public headers compile with -Wzero-as-null-pointer-constant
... or equivalent.
Task-number: QTBUG-45291
Change-Id: I1453477ad718335ca6c5c0c3447539cb93e21176
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/render/defaults')
-rw-r--r-- | src/render/defaults/qdiffusemapmaterial.h | 2 | ||||
-rw-r--r-- | src/render/defaults/qdiffusespecularmapmaterial.h | 2 | ||||
-rw-r--r-- | src/render/defaults/qforwardrenderer.h | 2 | ||||
-rw-r--r-- | src/render/defaults/qgoochmaterial.h | 4 | ||||
-rw-r--r-- | src/render/defaults/qnormaldiffusemapalphamaterial.h | 2 | ||||
-rw-r--r-- | src/render/defaults/qnormaldiffusemapmaterial.h | 4 | ||||
-rw-r--r-- | src/render/defaults/qnormaldiffusespecularmapmaterial.h | 4 | ||||
-rw-r--r-- | src/render/defaults/qpervertexcolormaterial.h | 2 | ||||
-rw-r--r-- | src/render/defaults/qphongalphamaterial.h | 2 | ||||
-rw-r--r-- | src/render/defaults/qphongmaterial.h | 2 | ||||
-rw-r--r-- | src/render/defaults/qskyboxentity.h | 2 |
11 files changed, 14 insertions, 14 deletions
diff --git a/src/render/defaults/qdiffusemapmaterial.h b/src/render/defaults/qdiffusemapmaterial.h index 5367abe9d..8725b89a6 100644 --- a/src/render/defaults/qdiffusemapmaterial.h +++ b/src/render/defaults/qdiffusemapmaterial.h @@ -57,7 +57,7 @@ class QT3DRENDERSHARED_EXPORT QDiffuseMapMaterial : public QMaterial Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QDiffuseMapMaterial(Qt3DCore::QNode *parent = 0); + explicit QDiffuseMapMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QDiffuseMapMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qdiffusespecularmapmaterial.h b/src/render/defaults/qdiffusespecularmapmaterial.h index 096c4ce88..4a0318cd9 100644 --- a/src/render/defaults/qdiffusespecularmapmaterial.h +++ b/src/render/defaults/qdiffusespecularmapmaterial.h @@ -57,7 +57,7 @@ class QT3DRENDERSHARED_EXPORT QDiffuseSpecularMapMaterial : public QMaterial Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = 0); + explicit QDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QDiffuseSpecularMapMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qforwardrenderer.h b/src/render/defaults/qforwardrenderer.h index 44f74983c..bbddbebfe 100644 --- a/src/render/defaults/qforwardrenderer.h +++ b/src/render/defaults/qforwardrenderer.h @@ -54,7 +54,7 @@ class QT3DRENDERSHARED_EXPORT QForwardRenderer : public QTechniqueFilter Q_PROPERTY(QColor clearColor READ clearColor WRITE setClearColor NOTIFY clearColorChanged) Q_PROPERTY(Qt3DCore::QEntity *camera READ camera WRITE setCamera NOTIFY cameraChanged) public: - explicit QForwardRenderer(Qt3DCore::QNode *parent = 0); + explicit QForwardRenderer(Qt3DCore::QNode *parent = Q_NULLPTR); ~QForwardRenderer(); QRectF viewportRect() const; diff --git a/src/render/defaults/qgoochmaterial.h b/src/render/defaults/qgoochmaterial.h index c7eba355d..b90233abc 100644 --- a/src/render/defaults/qgoochmaterial.h +++ b/src/render/defaults/qgoochmaterial.h @@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QGoochMaterial : public QMaterial Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged) public: - explicit QGoochMaterial(Qt3DCore::QNode *parent = 0); + explicit QGoochMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); QColor diffuse() const; QColor specular() const; QColor cool() const; @@ -86,7 +86,7 @@ Q_SIGNALS: void shininessChanged(float shininess); protected: - QGoochMaterial(QGoochMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); + QGoochMaterial(QGoochMaterialPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QGoochMaterial) diff --git a/src/render/defaults/qnormaldiffusemapalphamaterial.h b/src/render/defaults/qnormaldiffusemapalphamaterial.h index 57b53e2a4..5875bbd4c 100644 --- a/src/render/defaults/qnormaldiffusemapalphamaterial.h +++ b/src/render/defaults/qnormaldiffusemapalphamaterial.h @@ -49,7 +49,7 @@ class QT3DRENDERSHARED_EXPORT QNormalDiffuseMapAlphaMaterial : public QNormalDif { Q_OBJECT public: - explicit QNormalDiffuseMapAlphaMaterial(Qt3DCore::QNode *parent = 0); + explicit QNormalDiffuseMapAlphaMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QNormalDiffuseMapAlphaMaterial(); private: diff --git a/src/render/defaults/qnormaldiffusemapmaterial.h b/src/render/defaults/qnormaldiffusemapmaterial.h index 835c0a155..d6ca4edc8 100644 --- a/src/render/defaults/qnormaldiffusemapmaterial.h +++ b/src/render/defaults/qnormaldiffusemapmaterial.h @@ -58,7 +58,7 @@ class QT3DRENDERSHARED_EXPORT QNormalDiffuseMapMaterial : public QMaterial Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QNormalDiffuseMapMaterial(Qt3DCore::QNode *parent = 0); + explicit QNormalDiffuseMapMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QNormalDiffuseMapMaterial(); QColor ambient() const; @@ -85,7 +85,7 @@ Q_SIGNALS: void textureScaleChanged(float textureScale); protected: - QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); + QNormalDiffuseMapMaterial(QNormalDiffuseMapMaterialPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QNormalDiffuseMapMaterial) diff --git a/src/render/defaults/qnormaldiffusespecularmapmaterial.h b/src/render/defaults/qnormaldiffusespecularmapmaterial.h index 2e72cc0fa..263c8fecd 100644 --- a/src/render/defaults/qnormaldiffusespecularmapmaterial.h +++ b/src/render/defaults/qnormaldiffusespecularmapmaterial.h @@ -57,7 +57,7 @@ class QT3DRENDERSHARED_EXPORT QNormalDiffuseSpecularMapMaterial : public QMateri Q_PROPERTY(float textureScale READ textureScale WRITE setTextureScale NOTIFY textureScaleChanged) public: - explicit QNormalDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = 0); + explicit QNormalDiffuseSpecularMapMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QNormalDiffuseSpecularMapMaterial(); QColor ambient() const; @@ -84,7 +84,7 @@ Q_SIGNALS: void textureScaleChanged(float textureScale); protected: - QNormalDiffuseSpecularMapMaterial(QNormalDiffuseSpecularMapMaterialPrivate &dd, Qt3DCore::QNode *parent = 0); + QNormalDiffuseSpecularMapMaterial(QNormalDiffuseSpecularMapMaterialPrivate &dd, Qt3DCore::QNode *parent = Q_NULLPTR); private: Q_DECLARE_PRIVATE(QNormalDiffuseSpecularMapMaterial) diff --git a/src/render/defaults/qpervertexcolormaterial.h b/src/render/defaults/qpervertexcolormaterial.h index 300eab170..0e7125e3d 100644 --- a/src/render/defaults/qpervertexcolormaterial.h +++ b/src/render/defaults/qpervertexcolormaterial.h @@ -51,7 +51,7 @@ class QT3DRENDERSHARED_EXPORT QPerVertexColorMaterial : public QMaterial Q_OBJECT public: - explicit QPerVertexColorMaterial(Qt3DCore::QNode *parent = 0); + explicit QPerVertexColorMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPerVertexColorMaterial(); private: diff --git a/src/render/defaults/qphongalphamaterial.h b/src/render/defaults/qphongalphamaterial.h index 556777184..263ca344e 100644 --- a/src/render/defaults/qphongalphamaterial.h +++ b/src/render/defaults/qphongalphamaterial.h @@ -56,7 +56,7 @@ class QT3DRENDERSHARED_EXPORT QPhongAlphaMaterial : public QMaterial Q_PROPERTY(float alpha READ alpha WRITE setAlpha NOTIFY alphaChanged) public: - explicit QPhongAlphaMaterial(Qt3DCore::QNode *parent = 0); + explicit QPhongAlphaMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPhongAlphaMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qphongmaterial.h b/src/render/defaults/qphongmaterial.h index d9c50d515..2c1dfcfc5 100644 --- a/src/render/defaults/qphongmaterial.h +++ b/src/render/defaults/qphongmaterial.h @@ -55,7 +55,7 @@ class QT3DRENDERSHARED_EXPORT QPhongMaterial : public QMaterial Q_PROPERTY(float shininess READ shininess WRITE setShininess NOTIFY shininessChanged) public: - explicit QPhongMaterial(Qt3DCore::QNode *parent = 0); + explicit QPhongMaterial(Qt3DCore::QNode *parent = Q_NULLPTR); ~QPhongMaterial(); QColor ambient() const; diff --git a/src/render/defaults/qskyboxentity.h b/src/render/defaults/qskyboxentity.h index 4dfa84804..935710d2a 100644 --- a/src/render/defaults/qskyboxentity.h +++ b/src/render/defaults/qskyboxentity.h @@ -50,7 +50,7 @@ class QT3DRENDERSHARED_EXPORT QSkyboxEntity : public Qt3DCore::QEntity { Q_OBJECT public: - explicit QSkyboxEntity(Qt3DCore::QNode *parent = 0); + explicit QSkyboxEntity(Qt3DCore::QNode *parent = Q_NULLPTR); ~QSkyboxEntity(); void setBaseName(const QString &path); |