summaryrefslogtreecommitdiffstats
path: root/tests
diff options
context:
space:
mode:
Diffstat (limited to 'tests')
-rw-r--r--tests/auto/qcanbus/tst_qcanbus.cpp2
-rw-r--r--tests/auto/qmodbusserver/tst_qmodbusserver.cpp2
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."));
{