diff options
Diffstat (limited to 'tests/auto/core/qscene/tst_qscene.cpp')
| -rw-r--r-- | tests/auto/core/qscene/tst_qscene.cpp | 10 |
1 files changed, 5 insertions, 5 deletions
diff --git a/tests/auto/core/qscene/tst_qscene.cpp b/tests/auto/core/qscene/tst_qscene.cpp index 1c4003467..eabcc96fb 100644 --- a/tests/auto/core/qscene/tst_qscene.cpp +++ b/tests/auto/core/qscene/tst_qscene.cpp @@ -123,11 +123,11 @@ void tst_QScene::addObservable() Q_FOREACH (Qt3DCore::QObservableInterface *o, obs1) { QVERIFY(scene->nodeIdFromObservable(o) == node1->id()); - QVERIFY(scene->lookupNode(node1->id()) == Q_NULLPTR); + QVERIFY(scene->lookupNode(node1->id()) == nullptr); } Q_FOREACH (Qt3DCore::QObservableInterface *o, obs2) { QVERIFY(scene->nodeIdFromObservable(o) == node2->id()); - QVERIFY(scene->lookupNode(node2->id()) == Q_NULLPTR); + QVERIFY(scene->lookupNode(node2->id()) == nullptr); } } @@ -239,7 +239,7 @@ void tst_QScene::removeNodeObservable() scene->removeObservable(node1); // THEN - QVERIFY(scene->lookupNode(node1->id()) == Q_NULLPTR); + QVERIFY(scene->lookupNode(node1->id()) == nullptr); QVERIFY(scene->lookupObservables(node1->id()).empty()); QVERIFY(scene->nodeIdFromObservable(observables.at(0)) == Qt3DCore::QNodeId()); @@ -305,10 +305,10 @@ void tst_QScene::removeChildNode() while (!nodes.isEmpty()) { Qt3DCore::QNode *lst = nodes.takeLast(); QVERIFY(scene->lookupNode(lst->id()) == lst); - if (lst->parentNode() != Q_NULLPTR) { + if (lst->parentNode() != nullptr) { lst->setParent(Q_NODE_NULLPTR); QCoreApplication::processEvents(); - QVERIFY(scene->lookupNode(lst->id()) == Q_NULLPTR); + QVERIFY(scene->lookupNode(lst->id()) == nullptr); } } } |