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/qqmlvaluetypeproviders | |
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/qqmlvaluetypeproviders')
-rw-r--r-- | tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp | 18 |
1 files changed, 9 insertions, 9 deletions
diff --git a/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp b/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp index 1902801c8f..22074602b7 100644 --- a/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp +++ b/tests/auto/qml/qqmlvaluetypeproviders/tst_qqmlvaluetypeproviders.cpp @@ -78,7 +78,7 @@ void tst_qqmlvaluetypeproviders::qtqmlValueTypes() QVERIFY(!component.isError()); QVERIFY(component.errors().isEmpty()); QObject *object = component.create(); - QVERIFY(object != 0); + QVERIFY(object != nullptr); QVERIFY(object->property("qtqmlTypeSuccess").toBool()); QVERIFY(object->property("qtquickTypeSuccess").toBool()); delete object; @@ -91,7 +91,7 @@ void tst_qqmlvaluetypeproviders::qtquickValueTypes() QVERIFY(!component.isError()); QVERIFY(component.errors().isEmpty()); QObject *object = component.create(); - QVERIFY(object != 0); + QVERIFY(object != nullptr); QVERIFY(object->property("qtqmlTypeSuccess").toBool()); QVERIFY(object->property("qtquickTypeSuccess").toBool()); delete object; @@ -104,7 +104,7 @@ void tst_qqmlvaluetypeproviders::comparisonSemantics() QVERIFY(!component.isError()); QVERIFY(component.errors().isEmpty()); QObject *object = component.create(); - QVERIFY(object != 0); + QVERIFY(object != nullptr); QVERIFY(object->property("comparisonSuccess").toBool()); delete object; } @@ -116,7 +116,7 @@ void tst_qqmlvaluetypeproviders::cppIntegration() QVERIFY(!component.isError()); QVERIFY(component.errors().isEmpty()); QObject *object = component.create(); - QVERIFY(object != 0); + QVERIFY(object != nullptr); // ensure accessing / comparing / assigning cpp-defined props // and qml-defined props works in QML. @@ -156,7 +156,7 @@ void tst_qqmlvaluetypeproviders::jsObjectConversion() QVERIFY(!component.isError()); QVERIFY(component.errors().isEmpty()); QObject *object = component.create(); - QVERIFY(object != 0); + QVERIFY(object != nullptr); QVERIFY(object->property("qtquickTypeSuccess").toBool()); delete object; } @@ -168,7 +168,7 @@ void tst_qqmlvaluetypeproviders::invokableFunctions() QVERIFY(!component.isError()); QVERIFY(component.errors().isEmpty()); QObject *object = component.create(); - QVERIFY(object != 0); + QVERIFY(object != nullptr); QVERIFY(object->property("complete").toBool()); QVERIFY(object->property("success").toBool()); delete object; @@ -233,7 +233,7 @@ public: if (type == qMetaTypeId<TestValue>()) return &TestValueType::staticMetaObject; - return 0; + return nullptr; } }; @@ -284,7 +284,7 @@ void tst_qqmlvaluetypeproviders::userType() QQmlComponent component(&e, testFileUrl("userType.qml")); QScopedPointer<QObject> obj(component.create()); - QVERIFY(obj != 0); + QVERIFY(obj != nullptr); QCOMPARE(obj->property("success").toBool(), true); } @@ -295,7 +295,7 @@ void tst_qqmlvaluetypeproviders::changedSignal() QVERIFY(!component.isError()); QVERIFY(component.errors().isEmpty()); QScopedPointer<QObject> object(component.create()); - QVERIFY(object != 0); + QVERIFY(object != nullptr); QVERIFY(object->property("complete").toBool()); QVERIFY(object->property("success").toBool()); } |