diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-21 10:41:54 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-26 07:13:18 +0000 |
commit | 499ec43937e926e4f2fa57a9baa455fcb3862262 (patch) | |
tree | 206c90d47387f8322b68f5e3db613189397e1af3 /tests/auto/qml/bindingdependencyapi | |
parent | 53d1e9ed21d25e65a2f13606af479838f5f21fe7 (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/qml/bindingdependencyapi')
-rw-r--r-- | tests/auto/qml/bindingdependencyapi/tst_bindingdependencyapi.cpp | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/auto/qml/bindingdependencyapi/tst_bindingdependencyapi.cpp b/tests/auto/qml/bindingdependencyapi/tst_bindingdependencyapi.cpp index 6f24f85f6d..82c997a5b8 100644 --- a/tests/auto/qml/bindingdependencyapi/tst_bindingdependencyapi.cpp +++ b/tests/auto/qml/bindingdependencyapi/tst_bindingdependencyapi.cpp @@ -131,7 +131,7 @@ void tst_bindingdependencyapi::testSingleDep() c.setData(code, QUrl()); QObject *rect = c.create(); QTest::qWait(10); - QVERIFY(rect != 0); + QVERIFY(rect != nullptr); QObject *text = rect->findChildren<QQuickText *>().front(); QObject *referencedObject = rect->objectName() == referencedObjectName ? rect : rect->findChild<QObject *>(referencedObjectName); @@ -213,7 +213,7 @@ void tst_bindingdependencyapi::testManyDeps() qWarning() << c.errorString(); } QTest::qWait(100); - QVERIFY(rect != 0); + QVERIFY(rect != nullptr); QObject *text = rect->findChildren<QQuickText *>().front(); QObject *configObj = rect->findChild<QObject *>("config"); @@ -290,7 +290,7 @@ void tst_bindingdependencyapi::testConditionalDependencies() c.setData(code, QUrl()); QObject *rect = c.create(); QTest::qWait(10); - QVERIFY(rect != 0); + QVERIFY(rect != nullptr); QObject *text = rect->findChildren<QQuickText *>().front(); QObject *referencedObject = rect->objectName() == referencedObjectName ? rect : rect->findChild<QObject *>(referencedObjectName); @@ -336,7 +336,7 @@ void tst_bindingdependencyapi::testBindingLoop() qWarning() << c.errorString(); } QTest::qWait(100); - QVERIFY(rect != 0); + QVERIFY(rect != nullptr); QObject *text = rect->findChildren<QQuickText *>().front(); auto data = QQmlData::get(text); |