aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp
diff options
context:
space:
mode:
Diffstat (limited to 'tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp')
-rw-r--r--tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp48
1 files changed, 24 insertions, 24 deletions
diff --git a/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp b/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp
index 3519c53cb7..0499e2f9a6 100644
--- a/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp
+++ b/tests/auto/quick/qquickrepeater/tst_qquickrepeater.cpp
@@ -119,7 +119,7 @@ void tst_QQuickRepeater::numberModel()
qApp->processEvents();
QQuickRepeater *repeater = findItem<QQuickRepeater>(window->rootObject(), "repeater");
- QVERIFY(repeater != 0);
+ QVERIFY(repeater != nullptr);
QCOMPARE(repeater->parentItem()->childItems().count(), 5+1);
QVERIFY(!repeater->itemAt(-1));
@@ -160,7 +160,7 @@ void tst_QQuickRepeater::objectList()
qApp->processEvents();
QQuickRepeater *repeater = findItem<QQuickRepeater>(window->rootObject(), "repeater");
- QVERIFY(repeater != 0);
+ QVERIFY(repeater != nullptr);
QCOMPARE(repeater->property("errors").toInt(), 0);//If this fails either they are out of order or can't find the object's data
QCOMPARE(repeater->property("instantiated").toInt(), 100);
@@ -201,10 +201,10 @@ void tst_QQuickRepeater::stringList()
qApp->processEvents();
QQuickRepeater *repeater = findItem<QQuickRepeater>(window->rootObject(), "repeater");
- QVERIFY(repeater != 0);
+ QVERIFY(repeater != nullptr);
QQuickItem *container = findItem<QQuickItem>(window->rootObject(), "container");
- QVERIFY(container != 0);
+ QVERIFY(container != nullptr);
QCOMPARE(container->childItems().count(), data.count() + 3);
@@ -213,7 +213,7 @@ void tst_QQuickRepeater::stringList()
if (i == 0) {
QQuickText *name = qobject_cast<QQuickText*>(container->childItems().at(i));
- QVERIFY(name != 0);
+ QVERIFY(name != nullptr);
QCOMPARE(name->text(), QLatin1String("Zero"));
} else if (i == container->childItems().count() - 2) {
// The repeater itself
@@ -223,11 +223,11 @@ void tst_QQuickRepeater::stringList()
continue;
} else if (i == container->childItems().count() - 1) {
QQuickText *name = qobject_cast<QQuickText*>(container->childItems().at(i));
- QVERIFY(name != 0);
+ QVERIFY(name != nullptr);
QCOMPARE(name->text(), QLatin1String("Last"));
} else {
QQuickText *name = qobject_cast<QQuickText*>(container->childItems().at(i));
- QVERIFY(name != 0);
+ QVERIFY(name != nullptr);
QCOMPARE(name->text(), data.at(i-1));
}
}
@@ -249,9 +249,9 @@ void tst_QQuickRepeater::dataModel_adding()
qApp->processEvents();
QQuickRepeater *repeater = findItem<QQuickRepeater>(window->rootObject(), "repeater");
- QVERIFY(repeater != 0);
+ QVERIFY(repeater != nullptr);
QQuickItem *container = findItem<QQuickItem>(window->rootObject(), "container");
- QVERIFY(container != 0);
+ QVERIFY(container != nullptr);
QVERIFY(!repeater->itemAt(0));
@@ -331,9 +331,9 @@ void tst_QQuickRepeater::dataModel_removing()
qApp->processEvents();
QQuickRepeater *repeater = findItem<QQuickRepeater>(window->rootObject(), "repeater");
- QVERIFY(repeater != 0);
+ QVERIFY(repeater != nullptr);
QQuickItem *container = findItem<QQuickItem>(window->rootObject(), "container");
- QVERIFY(container != 0);
+ QVERIFY(container != nullptr);
QCOMPARE(container->childItems().count(), repeater->count()+1);
QSignalSpy countSpy(repeater, SIGNAL(countChanged()));
@@ -397,9 +397,9 @@ void tst_QQuickRepeater::dataModel_changes()
qApp->processEvents();
QQuickRepeater *repeater = findItem<QQuickRepeater>(window->rootObject(), "repeater");
- QVERIFY(repeater != 0);
+ QVERIFY(repeater != nullptr);
QQuickItem *container = findItem<QQuickItem>(window->rootObject(), "container");
- QVERIFY(container != 0);
+ QVERIFY(container != nullptr);
QCOMPARE(container->childItems().count(), repeater->count()+1);
// Check that model changes are propagated
@@ -431,10 +431,10 @@ void tst_QQuickRepeater::itemModel()
qApp->processEvents();
QQuickRepeater *repeater = findItem<QQuickRepeater>(window->rootObject(), "repeater");
- QVERIFY(repeater != 0);
+ QVERIFY(repeater != nullptr);
QQuickItem *container = findItem<QQuickItem>(window->rootObject(), "container");
- QVERIFY(container != 0);
+ QVERIFY(container != nullptr);
QCOMPARE(container->childItems().count(), 1);
@@ -474,9 +474,9 @@ void tst_QQuickRepeater::resetModel()
window->setSource(testFileUrl("repeater1.qml"));
qApp->processEvents();
QQuickRepeater *repeater = findItem<QQuickRepeater>(window->rootObject(), "repeater");
- QVERIFY(repeater != 0);
+ QVERIFY(repeater != nullptr);
QQuickItem *container = findItem<QQuickItem>(window->rootObject(), "container");
- QVERIFY(container != 0);
+ QVERIFY(container != nullptr);
QCOMPARE(repeater->count(), dataA.count());
for (int i=0; i<repeater->count(); i++)
@@ -567,9 +567,9 @@ void tst_QQuickRepeater::modelReset()
QVERIFY(rootItem);
QQuickRepeater *repeater = findItem<QQuickRepeater>(rootItem, "repeater");
- QVERIFY(repeater != 0);
+ QVERIFY(repeater != nullptr);
QQuickItem *container = findItem<QQuickItem>(rootItem, "container");
- QVERIFY(container != 0);
+ QVERIFY(container != nullptr);
QCOMPARE(repeater->count(), 0);
@@ -701,7 +701,7 @@ void tst_QQuickRepeater::asynchronous()
container = findItem<QQuickItem>(rootObject, "container");
}
- QQuickRepeater *repeater = 0;
+ QQuickRepeater *repeater = nullptr;
while (!repeater) {
bool b = false;
controller.incubateWhile(&b);
@@ -713,8 +713,8 @@ void tst_QQuickRepeater::asynchronous()
for (int i = 9; i >= 0; --i) {
QString name("delegate");
name += QString::number(i);
- QVERIFY(findItem<QQuickItem>(container, name) == 0);
- QQuickItem *item = 0;
+ QVERIFY(findItem<QQuickItem>(container, name) == nullptr);
+ QQuickItem *item = nullptr;
while (!item) {
bool b = false;
controller.incubateWhile(&b);
@@ -804,7 +804,7 @@ void tst_QQuickRepeater::invalidContextCrash()
// deleted first and then the repeater. During deletion the QML context
// has been deleted already and is invalid.
model->setParent(root.data());
- repeater->setParent(0);
+ repeater->setParent(nullptr);
repeater->setParent(root.data());
QCOMPARE(root->children().count(), 2);
@@ -813,7 +813,7 @@ void tst_QQuickRepeater::invalidContextCrash()
// Delete the root object, which will invalidate/delete the QML context
// and then delete the child QObjects, which may try to access the context.
- root.reset(0);
+ root.reset(nullptr);
}
void tst_QQuickRepeater::jsArrayChange()