diff options
author | Marc Mutz <marc.mutz@kdab.com> | 2015-06-30 22:11:15 +0200 |
---|---|---|
committer | Marc Mutz <marc.mutz@kdab.com> | 2015-07-06 11:32:44 +0000 |
commit | db5e672acc29858a59e8e14768cff2767306344e (patch) | |
tree | 73da54611708b5301dd82502308811ee665d075e /src/opengl/qglshaderprogram.h | |
parent | 861dca57d72260049b21ccace2e702703ec342b8 (diff) |
QtOpenGL: Use Q_NULLPTR instead of 0 in all public headers
This is in preparation of adding -Wzero-as-null-pointer-constant (or similar)
to the headers check.
Task-number: QTBUG-45291
Change-Id: I16c93bd36c242a6d402cf7622820e91eac782772
Reviewed-by: Sean Harmer <sean.harmer@kdab.com>
Diffstat (limited to 'src/opengl/qglshaderprogram.h')
-rw-r--r-- | src/opengl/qglshaderprogram.h | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h index 5d9fe22b0b..8f2c74fae7 100644 --- a/src/opengl/qglshaderprogram.h +++ b/src/opengl/qglshaderprogram.h @@ -58,8 +58,8 @@ public: }; Q_DECLARE_FLAGS(ShaderType, ShaderTypeBit) - explicit QGLShader(QGLShader::ShaderType type, QObject *parent = 0); - QGLShader(QGLShader::ShaderType type, const QGLContext *context, QObject *parent = 0); + explicit QGLShader(QGLShader::ShaderType type, QObject *parent = Q_NULLPTR); + QGLShader(QGLShader::ShaderType type, const QGLContext *context, QObject *parent = Q_NULLPTR); virtual ~QGLShader(); QGLShader::ShaderType shaderType() const; @@ -76,7 +76,7 @@ public: GLuint shaderId() const; - static bool hasOpenGLShaders(ShaderType type, const QGLContext *context = 0); + static bool hasOpenGLShaders(ShaderType type, const QGLContext *context = Q_NULLPTR); private: friend class QGLShaderProgram; @@ -94,8 +94,8 @@ class Q_OPENGL_EXPORT QGLShaderProgram : public QObject { Q_OBJECT public: - explicit QGLShaderProgram(QObject *parent = 0); - explicit QGLShaderProgram(const QGLContext *context, QObject *parent = 0); + explicit QGLShaderProgram(QObject *parent = Q_NULLPTR); + explicit QGLShaderProgram(const QGLContext *context, QObject *parent = Q_NULLPTR); virtual ~QGLShaderProgram(); bool addShader(QGLShader *shader); @@ -280,7 +280,7 @@ public: void setUniformValueArray(const char *name, const QMatrix4x3 *values, int count); void setUniformValueArray(const char *name, const QMatrix4x4 *values, int count); - static bool hasOpenGLShaderPrograms(const QGLContext *context = 0); + static bool hasOpenGLShaderPrograms(const QGLContext *context = Q_NULLPTR); private Q_SLOTS: void shaderDestroyed(); |