From db5e672acc29858a59e8e14768cff2767306344e Mon Sep 17 00:00:00 2001 From: Marc Mutz Date: Tue, 30 Jun 2015 22:11:15 +0200 Subject: 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 --- src/opengl/qglfunctions.h | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/opengl/qglfunctions.h') diff --git a/src/opengl/qglfunctions.h b/src/opengl/qglfunctions.h index 80b8596a20..ddb7b89d98 100644 --- a/src/opengl/qglfunctions.h +++ b/src/opengl/qglfunctions.h @@ -70,7 +70,7 @@ public: QGLFunctions::OpenGLFeatures openGLFeatures() const; bool hasOpenGLFeature(QGLFunctions::OpenGLFeature feature) const; - void initializeGLFunctions(const QGLContext *context = 0); + void initializeGLFunctions(const QGLContext *context = Q_NULLPTR); void glActiveTexture(GLenum texture); void glAttachShader(GLuint program, GLuint shader); @@ -172,14 +172,14 @@ public: private: QGLFunctionsPrivate *d_ptr; - static bool isInitialized(const QGLFunctionsPrivate *d) { return d != 0; } + static bool isInitialized(const QGLFunctionsPrivate *d) { return d != Q_NULLPTR; } }; Q_DECLARE_OPERATORS_FOR_FLAGS(QGLFunctions::OpenGLFeatures) struct QGLFunctionsPrivate { - QGLFunctionsPrivate(const QGLContext *context = 0); + QGLFunctionsPrivate(const QGLContext *context = Q_NULLPTR); QOpenGLFunctions *funcs; }; -- cgit v1.2.3