diff options
Diffstat (limited to 'tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp')
| -rw-r--r-- | tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp | 14 |
1 files changed, 9 insertions, 5 deletions
diff --git a/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp index ba973910a7..63e2f25d1d 100644 --- a/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp +++ b/tests/auto/corelib/kernel/qpointer/tst_qpointer.cpp @@ -98,7 +98,7 @@ void tst_QPointer::assignment_operators() QCOMPARE(p1, QPointer<QObject>(p2)); // Test assignment with a null pointer - p1 = 0; + p1 = nullptr; p2 = p1; QCOMPARE(p1, QPointer<QObject>(0)); QCOMPARE(p2, QPointer<QObject>(0)); @@ -131,9 +131,9 @@ void tst_QPointer::equality_operators() QVERIFY(p1 == p2); - QObject *object = 0; + QObject *object = nullptr; #ifndef QT_NO_WIDGETS - QWidget *widget = 0; + QWidget *widget = nullptr; #endif p1 = object; @@ -149,11 +149,15 @@ void tst_QPointer::equality_operators() QVERIFY(p1 == p2); // compare to zero - p1 = 0; + p1 = nullptr; QVERIFY(p1 == 0); QVERIFY(0 == p1); QVERIFY(p2 != 0); QVERIFY(0 != p2); + QVERIFY(p1 == nullptr); + QVERIFY(nullptr == p1); + QVERIFY(p2 != nullptr); + QVERIFY(nullptr != p2); QVERIFY(p1 == object); QVERIFY(object == p1); QVERIFY(p2 != object); @@ -188,7 +192,7 @@ void tst_QPointer::isNull() QVERIFY(p1.isNull()); p1 = this; QVERIFY(!p1.isNull()); - p1 = 0; + p1 = nullptr; QVERIFY(p1.isNull()); } |