From 58c14c4a7edcecdd9d58b682a9360c83e2274ec5 Mon Sep 17 00:00:00 2001 From: Kevin Funk Date: Mon, 18 Sep 2017 11:49:52 +0200 Subject: Replace Q_NULLPTR with nullptr where possible Remaining uses of Q_NULLPTR are in: src/corelib/global/qcompilerdetection.h (definition and documentation of Q_NULLPTR) tests/manual/qcursor/qcursorhighdpi/main.cpp (a test executable compilable both under Qt4 and Qt5) Change-Id: If6b074d91486e9b784138f4514f5c6d072acda9a Reviewed-by: Ville Voutilainen Reviewed-by: Lars Knoll Reviewed-by: Olivier Goffart (Woboq GmbH) --- src/opengl/qgl.h | 22 +++++++++++----------- src/opengl/qglbuffer.h | 2 +- src/opengl/qglcolormap.h | 2 +- src/opengl/qglfunctions.h | 6 +++--- src/opengl/qglpixelbuffer.h | 4 ++-- src/opengl/qglshaderprogram.h | 12 ++++++------ 6 files changed, 24 insertions(+), 24 deletions(-) (limited to 'src/opengl') diff --git a/src/opengl/qgl.h b/src/opengl/qgl.h index 8bafdb1031..902a2a2104 100644 --- a/src/opengl/qgl.h +++ b/src/opengl/qgl.h @@ -250,7 +250,7 @@ public: QGLContext(const QGLFormat& format); virtual ~QGLContext(); - virtual bool create(const QGLContext* shareContext = Q_NULLPTR); + virtual bool create(const QGLContext* shareContext = nullptr); bool isValid() const; bool isSharing() const; void reset(); @@ -318,7 +318,7 @@ public: QOpenGLContext *contextHandle() const; protected: - virtual bool chooseContext(const QGLContext* shareContext = Q_NULLPTR); + virtual bool chooseContext(const QGLContext* shareContext = nullptr); bool deviceIsPixmap() const; bool windowCreated() const; @@ -371,12 +371,12 @@ class Q_OPENGL_EXPORT QGLWidget : public QWidget Q_OBJECT Q_DECLARE_PRIVATE(QGLWidget) public: - explicit QGLWidget(QWidget* parent=Q_NULLPTR, - const QGLWidget* shareWidget = Q_NULLPTR, Qt::WindowFlags f=Qt::WindowFlags()); - explicit QGLWidget(QGLContext *context, QWidget* parent=Q_NULLPTR, - const QGLWidget* shareWidget = Q_NULLPTR, Qt::WindowFlags f=Qt::WindowFlags()); - explicit QGLWidget(const QGLFormat& format, QWidget* parent=Q_NULLPTR, - const QGLWidget* shareWidget = Q_NULLPTR, Qt::WindowFlags f=Qt::WindowFlags()); + explicit QGLWidget(QWidget* parent=nullptr, + const QGLWidget* shareWidget = nullptr, Qt::WindowFlags f=Qt::WindowFlags()); + explicit QGLWidget(QGLContext *context, QWidget* parent=nullptr, + const QGLWidget* shareWidget = nullptr, Qt::WindowFlags f=Qt::WindowFlags()); + explicit QGLWidget(const QGLFormat& format, QWidget* parent=nullptr, + const QGLWidget* shareWidget = nullptr, Qt::WindowFlags f=Qt::WindowFlags()); ~QGLWidget(); void qglColor(const QColor& c) const; @@ -395,7 +395,7 @@ public: void setFormat(const QGLFormat& format); QGLContext* context() const; - void setContext(QGLContext* context, const QGLContext* shareContext = Q_NULLPTR, + void setContext(QGLContext* context, const QGLContext* shareContext = nullptr, bool deleteOldContext = true); QPixmap renderPixmap(int w = 0, int h = 0, bool useContext = false); @@ -457,8 +457,8 @@ protected: QGLWidget(QGLWidgetPrivate &dd, const QGLFormat &format = QGLFormat(), - QWidget *parent = Q_NULLPTR, - const QGLWidget* shareWidget = Q_NULLPTR, + QWidget *parent = nullptr, + const QGLWidget* shareWidget = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); private: Q_DISABLE_COPY(QGLWidget) diff --git a/src/opengl/qglbuffer.h b/src/opengl/qglbuffer.h index 454036a938..daf5227c66 100644 --- a/src/opengl/qglbuffer.h +++ b/src/opengl/qglbuffer.h @@ -109,7 +109,7 @@ public: void write(int offset, const void *data, int count); void allocate(const void *data, int count); - inline void allocate(int count) { allocate(Q_NULLPTR, count); } + inline void allocate(int count) { allocate(nullptr, count); } void *map(QGLBuffer::Access access); bool unmap(); diff --git a/src/opengl/qglcolormap.h b/src/opengl/qglcolormap.h index 199ed82534..772e327e34 100644 --- a/src/opengl/qglcolormap.h +++ b/src/opengl/qglcolormap.h @@ -69,7 +69,7 @@ public: int findNearest(QRgb color) const; protected: - Qt::HANDLE handle() { return d ? d->cmapHandle : Q_NULLPTR; } + Qt::HANDLE handle() { return d ? d->cmapHandle : nullptr; } void setHandle(Qt::HANDLE ahandle) { d->cmapHandle = ahandle; } private: diff --git a/src/opengl/qglfunctions.h b/src/opengl/qglfunctions.h index 211212125e..d8c5249a1a 100644 --- a/src/opengl/qglfunctions.h +++ b/src/opengl/qglfunctions.h @@ -76,7 +76,7 @@ public: QGLFunctions::OpenGLFeatures openGLFeatures() const; bool hasOpenGLFeature(QGLFunctions::OpenGLFeature feature) const; - void initializeGLFunctions(const QGLContext *context = Q_NULLPTR); + void initializeGLFunctions(const QGLContext *context = nullptr); void glActiveTexture(GLenum texture); void glAttachShader(GLuint program, GLuint shader); @@ -178,14 +178,14 @@ public: private: QGLFunctionsPrivate *d_ptr; - static bool isInitialized(const QGLFunctionsPrivate *d) { return d != Q_NULLPTR; } + static bool isInitialized(const QGLFunctionsPrivate *d) { return d != nullptr; } }; Q_DECLARE_OPERATORS_FOR_FLAGS(QGLFunctions::OpenGLFeatures) struct QGLFunctionsPrivate { - QGLFunctionsPrivate(const QGLContext *context = Q_NULLPTR); + QGLFunctionsPrivate(const QGLContext *context = nullptr); QOpenGLFunctions *funcs; }; diff --git a/src/opengl/qglpixelbuffer.h b/src/opengl/qglpixelbuffer.h index 9735f51e4f..f5d7929c35 100644 --- a/src/opengl/qglpixelbuffer.h +++ b/src/opengl/qglpixelbuffer.h @@ -53,9 +53,9 @@ class Q_OPENGL_EXPORT QGLPixelBuffer : public QPaintDevice Q_DECLARE_PRIVATE(QGLPixelBuffer) public: QGLPixelBuffer(const QSize &size, const QGLFormat &format = QGLFormat::defaultFormat(), - QGLWidget *shareWidget = Q_NULLPTR); + QGLWidget *shareWidget = nullptr); QGLPixelBuffer(int width, int height, const QGLFormat &format = QGLFormat::defaultFormat(), - QGLWidget *shareWidget = Q_NULLPTR); + QGLWidget *shareWidget = nullptr); virtual ~QGLPixelBuffer(); bool isValid() const; diff --git a/src/opengl/qglshaderprogram.h b/src/opengl/qglshaderprogram.h index f95017d09c..3ce88197d2 100644 --- a/src/opengl/qglshaderprogram.h +++ b/src/opengl/qglshaderprogram.h @@ -64,8 +64,8 @@ public: }; Q_DECLARE_FLAGS(ShaderType, ShaderTypeBit) - explicit QGLShader(QGLShader::ShaderType type, QObject *parent = Q_NULLPTR); - QGLShader(QGLShader::ShaderType type, const QGLContext *context, QObject *parent = Q_NULLPTR); + explicit QGLShader(QGLShader::ShaderType type, QObject *parent = nullptr); + QGLShader(QGLShader::ShaderType type, const QGLContext *context, QObject *parent = nullptr); virtual ~QGLShader(); QGLShader::ShaderType shaderType() const; @@ -82,7 +82,7 @@ public: GLuint shaderId() const; - static bool hasOpenGLShaders(ShaderType type, const QGLContext *context = Q_NULLPTR); + static bool hasOpenGLShaders(ShaderType type, const QGLContext *context = nullptr); private: friend class QGLShaderProgram; @@ -100,8 +100,8 @@ class Q_OPENGL_EXPORT QGLShaderProgram : public QObject { Q_OBJECT public: - explicit QGLShaderProgram(QObject *parent = Q_NULLPTR); - explicit QGLShaderProgram(const QGLContext *context, QObject *parent = Q_NULLPTR); + explicit QGLShaderProgram(QObject *parent = nullptr); + explicit QGLShaderProgram(const QGLContext *context, QObject *parent = nullptr); virtual ~QGLShaderProgram(); bool addShader(QGLShader *shader); @@ -286,7 +286,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 = Q_NULLPTR); + static bool hasOpenGLShaderPrograms(const QGLContext *context = nullptr); private Q_SLOTS: void shaderDestroyed(); -- cgit v1.2.3