aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/quick/qquickflipable
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-02-21 10:41:54 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2018-02-26 07:13:18 +0000
commit499ec43937e926e4f2fa57a9baa455fcb3862262 (patch)
tree206c90d47387f8322b68f5e3db613189397e1af3 /tests/auto/quick/qquickflipable
parent53d1e9ed21d25e65a2f13606af479838f5f21fe7 (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/quick/qquickflipable')
-rw-r--r--tests/auto/quick/qquickflipable/tst_qquickflipable.cpp20
1 files changed, 10 insertions, 10 deletions
diff --git a/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp b/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp
index 9c892488f4..b4082b3d34 100644
--- a/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp
+++ b/tests/auto/quick/qquickflipable/tst_qquickflipable.cpp
@@ -61,7 +61,7 @@ void tst_qquickflipable::create()
QQmlComponent c(&engine, testFileUrl("test-flipable.qml"));
QQuickFlipable *obj = qobject_cast<QQuickFlipable*>(c.create());
- QVERIFY(obj != 0);
+ QVERIFY(obj != nullptr);
delete obj;
}
@@ -71,9 +71,9 @@ void tst_qquickflipable::checkFrontAndBack()
QQmlComponent c(&engine, testFileUrl("test-flipable.qml"));
QQuickFlipable *obj = qobject_cast<QQuickFlipable*>(c.create());
- QVERIFY(obj != 0);
- QVERIFY(obj->front() != 0);
- QVERIFY(obj->back() != 0);
+ QVERIFY(obj != nullptr);
+ QVERIFY(obj->front() != nullptr);
+ QVERIFY(obj->back() != nullptr);
delete obj;
}
@@ -83,9 +83,9 @@ void tst_qquickflipable::setFrontAndBack()
QQmlComponent c(&engine, testFileUrl("test-flipable.qml"));
QQuickFlipable *obj = qobject_cast<QQuickFlipable*>(c.create());
- QVERIFY(obj != 0);
- QVERIFY(obj->front() != 0);
- QVERIFY(obj->back() != 0);
+ QVERIFY(obj != nullptr);
+ QVERIFY(obj->front() != nullptr);
+ QVERIFY(obj->back() != nullptr);
QString message = c.url().toString() + ":3:1: QML Flipable: front is a write-once property";
QTest::ignoreMessage(QtWarningMsg, qPrintable(message));
@@ -102,7 +102,7 @@ void tst_qquickflipable::flipFlipable()
QQmlEngine engine;
QQmlComponent c(&engine, testFileUrl("flip-flipable.qml"));
QQuickFlipable *obj = qobject_cast<QQuickFlipable*>(c.create());
- QVERIFY(obj != 0);
+ QVERIFY(obj != nullptr);
QCOMPARE(obj->side(), QQuickFlipable::Front);
obj->setProperty("flipped", QVariant(true));
QTRY_COMPARE(obj->side(), QQuickFlipable::Back);
@@ -116,7 +116,7 @@ void tst_qquickflipable::QTBUG_9161_crash()
QQuickView *window = new QQuickView;
window->setSource(testFileUrl("crash.qml"));
QQuickItem *root = window->rootObject();
- QVERIFY(root != 0);
+ QVERIFY(root != nullptr);
window->show();
delete window;
}
@@ -126,7 +126,7 @@ void tst_qquickflipable::QTBUG_8474_qgv_abort()
QQuickView *window = new QQuickView;
window->setSource(testFileUrl("flipable-abort.qml"));
QQuickItem *root = window->rootObject();
- QVERIFY(root != 0);
+ QVERIFY(root != nullptr);
window->show();
delete window;
}