diff options
| author | Denis Shienkov <denis.shienkov@gmail.com> | 2016-04-21 14:10:59 +0300 |
|---|---|---|
| committer | Denis Shienkov <denis.shienkov@gmail.com> | 2016-04-21 12:33:54 +0000 |
| commit | f342b8243e292525ba72c9b34cc6f416d2f11e96 (patch) | |
| tree | 6a47b6b3b073e1ef0ec4c8d5bb2bbc4896579645 /tests | |
| parent | 7a05d8ed0f123372b29662c84c16f04140de5b28 (diff) | |
Use 'nullptr' where it is possible
Change-Id: I729e6b53cbc0b9a16c72c2351cc95d6bd7a2a0aa
Reviewed-by: Alex Blasche <alexander.blasche@theqtcompany.com>
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/auto/qcanbus/tst_qcanbus.cpp | 2 | ||||
| -rw-r--r-- | tests/auto/qmodbusserver/tst_qmodbusserver.cpp | 2 |
2 files changed, 2 insertions, 2 deletions
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<QCanBus> 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.")); { |