aboutsummaryrefslogtreecommitdiffstats
path: root/tests/auto/qml/debugger/qqmldebugservice
diff options
context:
space:
mode:
authorShawn Rutledge <shawn.rutledge@qt.io>2018-02-21 10:41:54 +0100
committerShawn Rutledge <shawn.rutledge@qt.io>2018-02-26 07:13:18 +0000
commit499ec43937e926e4f2fa57a9baa455fcb3862262 (patch)
tree206c90d47387f8322b68f5e3db613189397e1af3 /tests/auto/qml/debugger/qqmldebugservice
parent53d1e9ed21d25e65a2f13606af479838f5f21fe7 (diff)
use nullptr consistently (clang-tidy)
From now on we prefer nullptr instead of 0 to clarify cases where we are assigning or testing a pointer rather than a numeric zero. Also, replaced cases where 0 was passed as Qt::KeyboardModifiers with Qt::NoModifier (clang-tidy replaced them with nullptr, which waas wrong, so it was just as well to make the tests more readable rather than to revert those lines). Change-Id: I4735d35e4d9f42db5216862ce091429eadc6e65d Reviewed-by: Simon Hausmann <simon.hausmann@qt.io>
Diffstat (limited to 'tests/auto/qml/debugger/qqmldebugservice')
-rw-r--r--tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp14
1 files changed, 7 insertions, 7 deletions
diff --git a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
index 4e103e9a65..1daf6b581e 100644
--- a/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
+++ b/tests/auto/qml/debugger/qqmldebugservice/tst_qqmldebugservice.cpp
@@ -80,11 +80,11 @@ void tst_QQmlDebugService::initTestCase()
m_service = new QQmlDebugTestService("tst_QQmlDebugService", 2);
foreach (const QString &service, QQmlDebuggingEnabler::debuggerServices())
- QCOMPARE(QQmlDebugConnector::instance()->service(service), (QQmlDebugService *)0);
+ QCOMPARE(QQmlDebugConnector::instance()->service(service), (QQmlDebugService *)nullptr);
foreach (const QString &service, QQmlDebuggingEnabler::inspectorServices())
- QCOMPARE(QQmlDebugConnector::instance()->service(service), (QQmlDebugService *)0);
+ QCOMPARE(QQmlDebugConnector::instance()->service(service), (QQmlDebugService *)nullptr);
foreach (const QString &service, QQmlDebuggingEnabler::profilerServices())
- QCOMPARE(QQmlDebugConnector::instance()->service(service), (QQmlDebugService *)0);
+ QCOMPARE(QQmlDebugConnector::instance()->service(service), (QQmlDebugService *)nullptr);
const QString waitingMsg = QString("QML Debugger: Waiting for connection on port %1...").arg(PORT);
QTest::ignoreMessage(QtDebugMsg, waitingMsg.toLatin1().constData());
@@ -209,7 +209,7 @@ void tst_QQmlDebugService::checkSupportForDataStreamVersion()
void tst_QQmlDebugService::idForObject()
{
- QCOMPARE(QQmlDebugService::idForObject(0), -1);
+ QCOMPARE(QQmlDebugService::idForObject(nullptr), -1);
QObject *objA = new QObject;
@@ -231,15 +231,15 @@ void tst_QQmlDebugService::idForObject()
void tst_QQmlDebugService::objectForId()
{
- QCOMPARE(QQmlDebugService::objectForId(-1), static_cast<QObject*>(0));
- QCOMPARE(QQmlDebugService::objectForId(1), static_cast<QObject*>(0));
+ QCOMPARE(QQmlDebugService::objectForId(-1), static_cast<QObject*>(nullptr));
+ QCOMPARE(QQmlDebugService::objectForId(1), static_cast<QObject*>(nullptr));
QObject *obj = new QObject;
int id = QQmlDebugService::idForObject(obj);
QCOMPARE(QQmlDebugService::objectForId(id), obj);
delete obj;
- QCOMPARE(QQmlDebugService::objectForId(id), static_cast<QObject*>(0));
+ QCOMPARE(QQmlDebugService::objectForId(id), static_cast<QObject*>(nullptr));
}
void tst_QQmlDebugService::checkSupportForOldDataStreamVersion()