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 /src/qmltest/quicktestevent.cpp | |
| 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 'src/qmltest/quicktestevent.cpp')
| -rw-r--r-- | src/qmltest/quicktestevent.cpp | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/qmltest/quicktestevent.cpp b/src/qmltest/quicktestevent.cpp index bf255e9cda..ee375a896c 100644 --- a/src/qmltest/quicktestevent.cpp +++ b/src/qmltest/quicktestevent.cpp @@ -190,7 +190,7 @@ namespace QtQuickTest me.setTimestamp(++lastMouseTimestamp); break; case MouseRelease: - me = QMouseEvent(QEvent::MouseButtonRelease, pos, window->mapToGlobal(pos), button, 0, stateKey); + me = QMouseEvent(QEvent::MouseButtonRelease, pos, window->mapToGlobal(pos), button, nullptr, stateKey); me.setTimestamp(++lastMouseTimestamp); lastMouseTimestamp += 500; // avoid double clicks being generated break; @@ -355,7 +355,7 @@ QWindow *QuickTestEvent::eventWindow(QObject *item) QQuickItem *testParentitem = qobject_cast<QQuickItem *>(parent()); if (testParentitem) return testParentitem->window(); - return 0; + return nullptr; } QWindow *QuickTestEvent::activeWindow() |