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/qgl.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/qgl.h')
| -rw-r--r-- | src/opengl/qgl.h | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 63804cc28d..99abdd2ad6 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -235,7 +235,7 @@ public: QGLContext(const QGLFormat& format); virtual ~QGLContext(); - virtual bool create(const QGLContext* shareContext = 0); + virtual bool create(const QGLContext* shareContext = Q_NULLPTR); bool isValid() const; bool isSharing() const; void reset(); @@ -303,7 +303,7 @@ public: QOpenGLContext *contextHandle() const; protected: - virtual bool chooseContext(const QGLContext* shareContext = 0); + virtual bool chooseContext(const QGLContext* shareContext = Q_NULLPTR); bool deviceIsPixmap() const; bool windowCreated() const; @@ -380,7 +380,7 @@ public: void setFormat(const QGLFormat& format); QGLContext* context() const; - void setContext(QGLContext* context, const QGLContext* shareContext = 0, + void setContext(QGLContext* context, const QGLContext* shareContext = Q_NULLPTR, bool deleteOldContext = true); QPixmap renderPixmap(int w = 0, int h = 0, bool useContext = false); |