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/qqmlconsole | |
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/qqmlconsole')
-rw-r--r-- | tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp b/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp index f832143935..0d915f98f8 100644 --- a/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp +++ b/tests/auto/qml/qqmlconsole/tst_qqmlconsole.cpp @@ -84,7 +84,7 @@ void tst_qqmlconsole::logging() QQmlComponent component(&engine, testUrl); QObject *object = component.create(); - QVERIFY(object != 0); + QVERIFY(object != nullptr); delete object; } @@ -102,7 +102,7 @@ void tst_qqmlconsole::categorized_logging() QQmlComponent component(&engine, testUrl); QObject *object = component.create(); - QVERIFY2(object != 0, component.errorString().toUtf8()); + QVERIFY2(object != nullptr, component.errorString().toUtf8()); QVERIFY(messageHandler.messages().contains("qt.test: console.info")); QVERIFY(messageHandler.messages().contains("qt.test: console.warn")); @@ -135,7 +135,7 @@ void tst_qqmlconsole::tracing() QQmlComponent component(&engine, testUrl); QObject *object = component.create(); - QVERIFY(object != 0); + QVERIFY(object != nullptr); delete object; } @@ -149,7 +149,7 @@ void tst_qqmlconsole::profiling() QQmlComponent component(&engine, testUrl); QObject *object = component.create(); - QVERIFY(object != 0); + QVERIFY(object != nullptr); delete object; } @@ -170,7 +170,7 @@ void tst_qqmlconsole::testAssert() QQmlComponent component(&engine, testUrl); QObject *object = component.create(); - QVERIFY(object != 0); + QVERIFY(object != nullptr); delete object; } @@ -191,7 +191,7 @@ void tst_qqmlconsole::exception() QQmlComponent component(&engine, testUrl); QObject *object = component.create(); - QVERIFY(object != 0); + QVERIFY(object != nullptr); delete object; } |