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/frontend/qrendersettings.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/frontend/qrendersettings.cpp')
| -rw-r--r-- | src/render/frontend/qrendersettings.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/render/frontend/qrendersettings.cpp b/src/render/frontend/qrendersettings.cpp index d3d3cba04..f41ac1de9 100644 --- a/src/render/frontend/qrendersettings.cpp +++ b/src/render/frontend/qrendersettings.cpp @@ -47,7 +47,7 @@ namespace Qt3DRender { QRenderSettingsPrivate::QRenderSettingsPrivate() : Qt3DCore::QComponentPrivate() - , m_activeFrameGraph(Q_NULLPTR) + , m_activeFrameGraph(nullptr) , m_renderPolicy(QRenderSettings::OnDemand) { } @@ -109,7 +109,7 @@ void QRenderSettings::setActiveFrameGraph(QFrameGraphNode *activeFrameGraph) if (d->m_activeFrameGraph == activeFrameGraph) return; - if (activeFrameGraph != Q_NULLPTR && !activeFrameGraph->parent()) + if (activeFrameGraph != nullptr && !activeFrameGraph->parent()) activeFrameGraph->setParent(this); d->m_activeFrameGraph = activeFrameGraph; emit activeFrameGraphChanged(activeFrameGraph); |