diff options
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 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(); |