summaryrefslogtreecommitdiffstats
path: root/src/render/jobs/renderviewjobutils.cpp
diff options
context:
space:
mode:
authorSean Harmer <sean.harmer@kdab.com>2016-04-29 19:35:20 +0100
committerSean Harmer <sean.harmer@kdab.com>2016-05-01 15:43:11 +0000
commita01b14670e5b35a951ec57297613418dc829d65c (patch)
treed9bdcc4ca7b325ff5a1c2e68b801efe9e4d667b8 /src/render/jobs/renderviewjobutils.cpp
parentf9dc7c72090b9a11a3daf9e2c912213fbeec5739 (diff)
Q_NULLPTR -> nullptr
Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'src/render/jobs/renderviewjobutils.cpp')
-rw-r--r--src/render/jobs/renderviewjobutils.cpp12
1 files changed, 6 insertions, 6 deletions
diff --git a/src/render/jobs/renderviewjobutils.cpp b/src/render/jobs/renderviewjobutils.cpp
index 3dad829c8..caad0bdcb 100644
--- a/src/render/jobs/renderviewjobutils.cpp
+++ b/src/render/jobs/renderviewjobutils.cpp
@@ -183,7 +183,7 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN
const Render::StateSetNode *rStateSet = static_cast<const Render::StateSetNode *>(node);
// Create global RenderStateSet for renderView if no stateSet was set before
RenderStateSet *stateSet = rv->stateSet();
- if (stateSet == Q_NULLPTR) {
+ if (stateSet == nullptr) {
stateSet = rv->allocator()->allocate<RenderStateSet>();
rv->setStateSet(stateSet);
}
@@ -218,7 +218,7 @@ void setRenderViewConfigFromFrameGraphLeafNode(RenderView *rv, const FrameGraphN
case FrameGraphNode::Surface: {
// Use the surface closest to leaf node
- if (rv->surface() == Q_NULLPTR) {
+ if (rv->surface() == nullptr) {
const Render::RenderSurfaceSelector *surfaceSelector
= static_cast<const Render::RenderSurfaceSelector *>(node);
rv->setSurface(surfaceSelector->surface());
@@ -246,7 +246,7 @@ Technique *findTechniqueForEffect(Renderer *renderer,
Effect *effect)
{
if (!effect)
- return Q_NULLPTR;
+ return nullptr;
NodeManagers *manager = renderer->nodeManagers();
@@ -263,7 +263,7 @@ Technique *findTechniqueForEffect(Renderer *renderer,
// If no techniqueFilter is present, we return the technique as it satisfies OpenGL version
const TechniqueFilter *techniqueFilter = renderView->techniqueFilter();
- bool foundMatch = (techniqueFilter == Q_NULLPTR || techniqueFilter->filters().isEmpty());
+ bool foundMatch = (techniqueFilter == nullptr || techniqueFilter->filters().isEmpty());
if (foundMatch)
return technique;
@@ -300,7 +300,7 @@ Technique *findTechniqueForEffect(Renderer *renderer,
}
// We failed to find a suitable technique to use :(
- return Q_NULLPTR;
+ return nullptr;
}
@@ -412,7 +412,7 @@ const int qNodeIdTypeId = qMetaTypeId<QNodeId>();
}
UniformBlockValueBuilder::UniformBlockValueBuilder()
- : shaderDataManager(Q_NULLPTR)
+ : shaderDataManager(nullptr)
{
}