summaryrefslogtreecommitdiffstats
path: root/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.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 /tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp
parentf9dc7c72090b9a11a3daf9e2c912213fbeec5739 (diff)
Q_NULLPTR -> nullptr
Task-number: QTBUG-52736 Change-Id: I58f9cbcdf018e7b672d33dd865067485412b79fe Reviewed-by: Paul Lemire <paul.lemire@kdab.com>
Diffstat (limited to 'tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp')
-rw-r--r--tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp
index 4f1494c78..ed4bcc207 100644
--- a/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp
+++ b/tests/auto/render/qrendertargetselector/tst_qrendertargetselector.cpp
@@ -47,7 +47,7 @@ private Q_SLOTS:
{
QScopedPointer<Qt3DRender::QRenderTargetSelector> defaultTargetSelector(new Qt3DRender::QRenderTargetSelector);
- QVERIFY(defaultTargetSelector->target() == Q_NULLPTR);
+ QVERIFY(defaultTargetSelector->target() == nullptr);
QCOMPARE(defaultTargetSelector->outputs().count(), 0);
}
@@ -58,7 +58,7 @@ private Q_SLOTS:
QTest::addColumn<Qt3DRender::QRenderTarget * >("target");
Qt3DRender::QRenderTargetSelector *defaultConstructed = new Qt3DRender::QRenderTargetSelector();
- QTest::newRow("defaultConstructed") << defaultConstructed << QVector<Qt3DRender::QRenderTargetOutput::AttachmentPoint>() << static_cast<Qt3DRender::QRenderTarget *>(Q_NULLPTR);
+ QTest::newRow("defaultConstructed") << defaultConstructed << QVector<Qt3DRender::QRenderTargetOutput::AttachmentPoint>() << static_cast<Qt3DRender::QRenderTarget *>(nullptr);
Qt3DRender::QRenderTargetSelector *renderTargetSelectorWithTarget = new Qt3DRender::QRenderTargetSelector();
Qt3DRender::QRenderTarget *target1 = new Qt3DRender::QRenderTarget();
@@ -133,7 +133,7 @@ private Q_SLOTS:
QCOMPARE(arbiter.events.size(), 0);
// WHEN
- renderTargetSelector->setTarget(Q_NULLPTR);
+ renderTargetSelector->setTarget(nullptr);
QCoreApplication::processEvents();
// THEN