diff options
author | Sean Harmer <sean.harmer@kdab.com> | 2016-04-29 19:35:20 +0100 |
---|---|---|
committer | Sean Harmer <sean.harmer@kdab.com> | 2016-05-01 15:43:11 +0000 |
commit | a01b14670e5b35a951ec57297613418dc829d65c (patch) | |
tree | d9bdcc4ca7b325ff5a1c2e68b801efe9e4d667b8 /src/render/materialsystem/shader.cpp | |
parent | f9dc7c72090b9a11a3daf9e2c912213fbeec5739 (diff) |
Q_NULLPTR -> nullptr
Task-number: QTBUG-52736
Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe
Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/materialsystem/shader.cpp')
-rw-r--r-- | src/render/materialsystem/shader.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/materialsystem/shader.cpp b/src/render/materialsystem/shader.cpp index 01629beec..87dce2111 100644 --- a/src/render/materialsystem/shader.cpp +++ b/src/render/materialsystem/shader.cpp @@ -86,7 +86,7 @@ void Shader::cleanup() m_dna = 0; // TO DO: ShaderProgram is leaked as of now // Fix that taking care that they may be shared given a same dna - m_program = Q_NULLPTR; + m_program = nullptr; m_uniformsNames.clear(); m_attributesNames.clear(); m_uniformBlockNames.clear(); @@ -327,7 +327,7 @@ QOpenGLShaderProgram *Shader::createProgram(GraphicsContext *context) context->bindFragOutputs(p->programId(), m_fragOutputs); if (!p->link()) { qWarning().noquote() << "Failed to link shader program:" << p->log(); - return Q_NULLPTR; + return nullptr; } // take from scoped-pointer so it doesn't get deleted |