diff options
Diffstat (limited to 'tests/auto/quick/qquickpath/tst_qquickpath.cpp')
-rw-r--r-- | tests/auto/quick/qquickpath/tst_qquickpath.cpp | 22 |
1 files changed, 11 insertions, 11 deletions
diff --git a/tests/auto/quick/qquickpath/tst_qquickpath.cpp b/tests/auto/quick/qquickpath/tst_qquickpath.cpp index 106d7afd85..12a8c673b0 100644 --- a/tests/auto/quick/qquickpath/tst_qquickpath.cpp +++ b/tests/auto/quick/qquickpath/tst_qquickpath.cpp @@ -53,7 +53,7 @@ void tst_QuickPath::arc() QQmlEngine engine; QQmlComponent c(&engine, testFileUrl("arc.qml")); QQuickPath *obj = qobject_cast<QQuickPath*>(c.create()); - QVERIFY(obj != 0); + QVERIFY(obj != nullptr); QCOMPARE(obj->startX(), 0.); QCOMPARE(obj->startY(), 0.); @@ -62,7 +62,7 @@ void tst_QuickPath::arc() QCOMPARE(list.count(), 1); QQuickPathArc* arc = qobject_cast<QQuickPathArc*>(list.at(0)); - QVERIFY(arc != 0); + QVERIFY(arc != nullptr); QCOMPARE(arc->x(), 100.); QCOMPARE(arc->y(), 100.); QCOMPARE(arc->radiusX(), 100.); @@ -88,13 +88,13 @@ void tst_QuickPath::angleArc() QQmlEngine engine; QQmlComponent c(&engine, testFileUrl("anglearc.qml")); QQuickPath *obj = qobject_cast<QQuickPath*>(c.create()); - QVERIFY(obj != 0); + QVERIFY(obj != nullptr); QQmlListReference list(obj, "pathElements"); QCOMPARE(list.count(), 1); QQuickPathAngleArc* arc = qobject_cast<QQuickPathAngleArc*>(list.at(0)); - QVERIFY(arc != 0); + QVERIFY(arc != nullptr); QCOMPARE(arc->centerX(), 100.); QCOMPARE(arc->centerY(), 100.); QCOMPARE(arc->radiusX(), 50.); @@ -127,7 +127,7 @@ void tst_QuickPath::catmullromCurve() QQmlEngine engine; QQmlComponent c(&engine, testFileUrl("curve.qml")); QQuickPath *obj = qobject_cast<QQuickPath*>(c.create()); - QVERIFY(obj != 0); + QVERIFY(obj != nullptr); QCOMPARE(obj->startX(), 0.); QCOMPARE(obj->startY(), 0.); @@ -136,12 +136,12 @@ void tst_QuickPath::catmullromCurve() QCOMPARE(list.count(), 3); QQuickPathCatmullRomCurve* curve = qobject_cast<QQuickPathCatmullRomCurve*>(list.at(0)); - QVERIFY(curve != 0); + QVERIFY(curve != nullptr); QCOMPARE(curve->x(), 100.); QCOMPARE(curve->y(), 50.); curve = qobject_cast<QQuickPathCatmullRomCurve*>(list.at(2)); - QVERIFY(curve != 0); + QVERIFY(curve != nullptr); QCOMPARE(curve->x(), 100.); QCOMPARE(curve->y(), 150.); @@ -163,7 +163,7 @@ void tst_QuickPath::closedCatmullromCurve() QQmlEngine engine; QQmlComponent c(&engine, testFileUrl("closedcurve.qml")); QQuickPath *obj = qobject_cast<QQuickPath*>(c.create()); - QVERIFY(obj != 0); + QVERIFY(obj != nullptr); QCOMPARE(obj->startX(), 50.); QCOMPARE(obj->startY(), 50.); @@ -172,7 +172,7 @@ void tst_QuickPath::closedCatmullromCurve() QCOMPARE(list.count(), 3); QQuickPathCatmullRomCurve* curve = qobject_cast<QQuickPathCatmullRomCurve*>(list.at(2)); - QVERIFY(curve != 0); + QVERIFY(curve != nullptr); QCOMPARE(curve->x(), 50.); QCOMPARE(curve->y(), 50.); @@ -196,7 +196,7 @@ void tst_QuickPath::svg() QQmlEngine engine; QQmlComponent c(&engine, testFileUrl("svg.qml")); QQuickPath *obj = qobject_cast<QQuickPath*>(c.create()); - QVERIFY(obj != 0); + QVERIFY(obj != nullptr); QCOMPARE(obj->startX(), 0.); QCOMPARE(obj->startY(), 0.); @@ -205,7 +205,7 @@ void tst_QuickPath::svg() QCOMPARE(list.count(), 1); QQuickPathSvg* svg = qobject_cast<QQuickPathSvg*>(list.at(0)); - QVERIFY(svg != 0); + QVERIFY(svg != nullptr); QCOMPARE(svg->path(), QLatin1String("M200,300 Q400,50 600,300 T1000,300")); QPainterPath path = obj->path(); |