From f342b8243e292525ba72c9b34cc6f416d2f11e96 Mon Sep 17 00:00:00 2001 From: Denis Shienkov Date: Thu, 21 Apr 2016 14:10:59 +0300 Subject: Use 'nullptr' where it is possible Change-Id: I729e6b53cbc0b9a16c72c2351cc95d6bd7a2a0aa Reviewed-by: Alex Blasche --- tests/auto/qcanbus/tst_qcanbus.cpp | 2 +- tests/auto/qmodbusserver/tst_qmodbusserver.cpp | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'tests') diff --git a/tests/auto/qcanbus/tst_qcanbus.cpp b/tests/auto/qcanbus/tst_qcanbus.cpp index 5148415..664f4e8 100644 --- a/tests/auto/qcanbus/tst_qcanbus.cpp +++ b/tests/auto/qcanbus/tst_qcanbus.cpp @@ -70,7 +70,7 @@ void tst_QCanBus::initTestCase() + QStringLiteral("/../../../../plugins")); #endif bus = QCanBus::instance(); - QVERIFY(bus != 0); + QVERIFY(bus); QPointer sameInstance; sameInstance = QCanBus::instance(); QCOMPARE(bus, sameInstance); diff --git a/tests/auto/qmodbusserver/tst_qmodbusserver.cpp b/tests/auto/qmodbusserver/tst_qmodbusserver.cpp index 114063a..63667b7 100644 --- a/tests/auto/qmodbusserver/tst_qmodbusserver.cpp +++ b/tests/auto/qmodbusserver/tst_qmodbusserver.cpp @@ -1107,7 +1107,7 @@ private slots: } QCOMPARE(s_msg, QString("QModbusServer::data() call did end in the expected OVERRIDE.")); { - s.data(QModbusDataUnit::Coils, 0u, Q_NULLPTR); + s.data(QModbusDataUnit::Coils, 0u, nullptr); } QCOMPARE(s_msg, QString("QModbusServer::data() call did end in the expected OVERRIDE.")); { -- cgit v1.2.3