aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickview/tst_qquickview.cpp
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-02-21 10:41:54 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2018-02-26 07:13:18 +0000
commit499ec43937e926e4f2fa57a9baa455fcb3862262 (patch)
tree206c90d47387f8322b68f5e3db613189397e1af3 /tests/auto/quick/qquickview/tst_qquickview.cpp
parent53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff)
use nullptr consistently (clang-tidy)
From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/quick/qquickview/tst_qquickview.cpp')
-rw-r--r--tests/auto/quick/qquickview/tst_qquickview.cpp6
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/quick/qquickview/tst_qquickview.cpp b/tests/auto/quick/qquickview/tst_qquickview.cpp
index 5849d35353..e259ed1ae7 100644
--- a/tests/auto/quick/qquickview/tst_qquickview.cpp
+++ b/tests/auto/quick/qquickview/tst_qquickview.cpp
@@ -212,11 +212,11 @@ void tst_QQuickView::engine()
QQmlEngine *engine = new QQmlEngine;
QVERIFY(!engine->incubationController());
- QQuickView *view = new QQuickView(engine, 0);
+ QQuickView *view = new QQuickView(engine, nullptr);
QVERIFY(view);
QCOMPARE(engine->incubationController(), view->incubationController());
- QQuickView *view2 = new QQuickView(engine, 0);
+ QQuickView *view2 = new QQuickView(engine, nullptr);
QVERIFY(view);
QCOMPARE(engine->incubationController(), view->incubationController());
delete view;
@@ -228,7 +228,7 @@ void tst_QQuickView::engine()
QVERIFY(!engine->incubationController());
QQuickView *view3 = new QQuickView;
- QQuickView *view4 = new QQuickView(view3->engine(), 0);
+ QQuickView *view4 = new QQuickView(view3->engine(), nullptr);
QVERIFY(view3->engine());
QVERIFY(view4->engine());