From 41e7b71c410b77a81d09d3cc2e169ffd7975b4d2 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Tue, 12 Mar 2019 11:46:26 +0100 Subject: More nullptr usage in headers Diff generated by running clang-tidy's modernize-use-nullptr checker on the CMake-based Qt version. Skipping src/3rdparty, examples/, tests/ Change-Id: Ib182074e2e2fd52f63093f73b3e2e4c0cb7af188 Reviewed-by: Friedemann Kleint Reviewed-by: Simon Hausmann --- src/gui/opengl/qopengltexturehelper_p.h | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) (limited to 'src/gui/opengl/qopengltexturehelper_p.h') diff --git a/src/gui/opengl/qopengltexturehelper_p.h b/src/gui/opengl/qopengltexturehelper_p.h index 00f6f9e5aa..62d0125daf 100644 --- a/src/gui/opengl/qopengltexturehelper_p.h +++ b/src/gui/opengl/qopengltexturehelper_p.h @@ -167,7 +167,7 @@ public: inline void glTextureSubImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, - const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = 0) + const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = nullptr) { if (options) { QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions(); @@ -181,7 +181,7 @@ public: inline void glTextureSubImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, - const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = 0) + const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = nullptr) { if (options) { QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions(); @@ -195,7 +195,7 @@ public: inline void glTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, - const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = 0) + const GLvoid *pixels, const QOpenGLPixelTransferOptions * const options = nullptr) { if (options) { QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions(); @@ -222,7 +222,7 @@ public: inline void glCompressedTextureSubImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *bits, - const QOpenGLPixelTransferOptions * const options = 0) + const QOpenGLPixelTransferOptions * const options = nullptr) { if (options) { QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions(); @@ -238,7 +238,7 @@ public: GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *bits, - const QOpenGLPixelTransferOptions * const options = 0) + const QOpenGLPixelTransferOptions * const options = nullptr) { if (options) { QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions(); @@ -254,7 +254,7 @@ public: GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *bits, - const QOpenGLPixelTransferOptions * const options = 0) + const QOpenGLPixelTransferOptions * const options = nullptr) { if (options) { QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions(); @@ -269,7 +269,7 @@ public: inline void glCompressedTextureImage1D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *bits, - const QOpenGLPixelTransferOptions * const options = 0) + const QOpenGLPixelTransferOptions * const options = nullptr) { if (options) { QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions(); @@ -284,7 +284,7 @@ public: inline void glCompressedTextureImage2D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *bits, - const QOpenGLPixelTransferOptions * const options = 0) + const QOpenGLPixelTransferOptions * const options = nullptr) { if (options) { @@ -300,7 +300,7 @@ public: inline void glCompressedTextureImage3D(GLuint texture, GLenum target, GLenum bindingTarget, GLint level, GLenum internalFormat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *bits, - const QOpenGLPixelTransferOptions * const options = 0) + const QOpenGLPixelTransferOptions * const options = nullptr) { if (options) { QOpenGLPixelTransferOptions oldOptions = savePixelUploadOptions(); -- cgit v1.2.3