diff options
author | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-21 10:41:54 +0100 |
---|---|---|
committer | Shawn Rutledge <shawn.rutledge@qt.io> | 2018-02-26 07:13:18 +0000 |
commit | 499ec43937e926e4f2fa57a9baa455fcb3862262 (patch) | |
tree | 206c90d47387f8322b68f5e3db613189397e1af3 /tests/auto/qml/debugger/qqmldebuglocal | |
parent | 53d1e9ed21d25e65a2f13606af479838f5f21fe7 (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/qqmldebuglocal')
-rw-r--r-- | tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp b/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp index 4b28857fc0..9f0501241d 100644 --- a/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp +++ b/tests/auto/qml/debugger/qqmldebuglocal/tst_qqmldebuglocal.cpp @@ -64,7 +64,7 @@ private slots: void tst_QQmlDebugLocal::initTestCase() { - fileName = QString::fromLatin1("tst_QQmlDebugLocal%1").arg(std::time(0)); + fileName = QString::fromLatin1("tst_QQmlDebugLocal%1").arg(std::time(nullptr)); QQmlDebugConnector::setPluginKey("QQmlDebugServer"); QTest::ignoreMessage(QtWarningMsg, "QML debugger: Cannot set plugin key after loading the plugin."); @@ -119,7 +119,7 @@ void tst_QQmlDebugLocal::state() QQmlDebugClient client2("tst_QQmlDebugLocal::state()", m_conn); QCOMPARE(client2.state(), QQmlDebugClient::NotConnected); - QQmlDebugClient client3("tst_QQmlDebugLocal::state3()", 0); + QQmlDebugClient client3("tst_QQmlDebugLocal::state3()", nullptr); QCOMPARE(client3.state(), QQmlDebugClient::NotConnected); } |