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>

1 files changed, 9 insertions, 9 deletions

diff --git a/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp b/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
index 90b719d000..a66f13e6bb 100644
--- a/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
+++ b/tests/auto/qml/qqmlinstantiator/tst_qqmlinstantiator.cpp
@@ -59,7 +59,7 @@ void tst_qqmlinstantiator::createNone()
     QQmlEngine engine;
     QQmlComponent component(&engine, testFileUrl("createNone.qml"));
     QQmlInstantiator *instantiator = qobject_cast<QQmlInstantiator*>(component.create());
-    QVERIFY(instantiator != 0);
+    QVERIFY(instantiator != nullptr);
     QCOMPARE(instantiator->isActive(), true);
     QCOMPARE(instantiator->count(), 0);
     QCOMPARE(instantiator->property("success").toBool(), true);
@@ -71,7 +71,7 @@ void tst_qqmlinstantiator::createSingle()
     QQmlEngine engine;
     QQmlComponent component(&engine, testFileUrl("createSingle.qml"));
     QQmlInstantiator *instantiator = qobject_cast<QQmlInstantiator*>(component.create());
-    QVERIFY(instantiator != 0);
+    QVERIFY(instantiator != nullptr);
     QCOMPARE(instantiator->isActive(), true);
     QCOMPARE(instantiator->count(), 1);
     QVERIFY(instantiator->delegate()->isReady());
@@ -88,7 +88,7 @@ void tst_qqmlinstantiator::createMultiple()
     QQmlEngine engine;
     QQmlComponent component(&engine, testFileUrl("createMultiple.qml"));
     QQmlInstantiator *instantiator = qobject_cast<QQmlInstantiator*>(component.create());
-    QVERIFY(instantiator != 0);
+    QVERIFY(instantiator != nullptr);
     QCOMPARE(instantiator->isActive(), true);
     QCOMPARE(instantiator->count(), 10);
 
@@ -106,7 +106,7 @@ void tst_qqmlinstantiator::stringModel()
     QQmlEngine engine;
     QQmlComponent component(&engine, testFileUrl("stringModel.qml"));
     QQmlInstantiator *instantiator = qobject_cast<QQmlInstantiator*>(component.create());
-    QVERIFY(instantiator != 0);
+    QVERIFY(instantiator != nullptr);
     QCOMPARE(instantiator->isActive(), true);
     QCOMPARE(instantiator->count(), 4);
 
@@ -123,7 +123,7 @@ void tst_qqmlinstantiator::activeProperty()
     QQmlEngine engine;
     QQmlComponent component(&engine, testFileUrl("inactive.qml"));
     QQmlInstantiator *instantiator = qobject_cast<QQmlInstantiator*>(component.create());
-    QVERIFY(instantiator != 0);
+    QVERIFY(instantiator != nullptr);
     QSignalSpy activeSpy(instantiator, SIGNAL(activeChanged()));
     QSignalSpy countSpy(instantiator, SIGNAL(countChanged()));
     QSignalSpy objectSpy(instantiator, SIGNAL(objectChanged()));
@@ -158,7 +158,7 @@ void tst_qqmlinstantiator::intModelChange()
     QQmlEngine engine;
     QQmlComponent component(&engine, testFileUrl("createMultiple.qml"));
     QQmlInstantiator *instantiator = qobject_cast<QQmlInstantiator*>(component.create());
-    QVERIFY(instantiator != 0);
+    QVERIFY(instantiator != nullptr);
     QSignalSpy activeSpy(instantiator, SIGNAL(activeChanged()));
     QSignalSpy countSpy(instantiator, SIGNAL(countChanged()));
     QSignalSpy objectSpy(instantiator, SIGNAL(objectChanged()));
@@ -194,11 +194,11 @@ void tst_qqmlinstantiator::createAndRemove()
     StringModel *model = new StringModel("model1");
     engine.rootContext()->setContextProperty("model1", model);
     QObject *rootObject = component.create();
-    QVERIFY(rootObject != 0);
+    QVERIFY(rootObject != nullptr);
 
     QQmlInstantiator *instantiator =
         qobject_cast<QQmlInstantiator*>(rootObject->findChild<QObject*>("instantiator1"));
-    QVERIFY(instantiator != 0);
+    QVERIFY(instantiator != nullptr);
     model->drop(1);
     QVector<QString> names;
     names << "Beta" << "Gamma" << "Delta";
@@ -234,7 +234,7 @@ void tst_qqmlinstantiator::asynchronous()
     QQmlInstantiator *instantiator = qobject_cast<QQmlInstantiator *>(incubator.object());
     while (incubationController.incubatingObjectCount() > 0)
         incubationController.incubateFor(10);
-    QVERIFY(instantiator != 0);
+    QVERIFY(instantiator != nullptr);
     QCOMPARE(instantiator->isActive(), true);
     QCOMPARE(instantiator->count(), 10);