diff options
| author | Johan Klokkhammer Helsing <johan.helsing@qt.io> | 2018-02-20 13:35:03 +0100 |
|---|---|---|
| committer | Johan Helsing <johan.helsing@qt.io> | 2018-02-20 14:15:08 +0000 |
| commit | 1ebb4e0d64bf27dfc6c38b9770ae744fad87fb82 (patch) | |
| tree | f92eb1649a32785f93fe6af8df82c8d0611b21e0 /tests/auto/client | |
| parent | abfdf34f510b64439c85cc54f47b41c4ce3f9c61 (diff) | |
Use nullptr instead of 0 or NULL
Applied automatic fixes using clang-tidy's modernize-use-nullptr, and some
manual cleanup to prevent QFlag macros to be affected.
Change-Id: I88f94390185bc6e6f23693b68723cd5710815ae6
Reviewed-by: Shawn Rutledge <shawn.rutledge@qt.io>
Diffstat (limited to 'tests/auto/client')
| -rw-r--r-- | tests/auto/client/client/tst_client.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/tests/auto/client/client/tst_client.cpp b/tests/auto/client/client/tst_client.cpp index 94198b457..0e086c7a6 100644 --- a/tests/auto/client/client/tst_client.cpp +++ b/tests/auto/client/client/tst_client.cpp @@ -295,9 +295,9 @@ void tst_WaylandClient::events() QTRY_COMPARE(QGuiApplication::focusWindow(), &window); QCOMPARE(window.focusOutEventCount, 0); - compositor->setKeyboardFocus(QSharedPointer<MockSurface>(0)); + compositor->setKeyboardFocus(QSharedPointer<MockSurface>(nullptr)); QTRY_COMPARE(window.focusOutEventCount, 1); - QTRY_COMPARE(QGuiApplication::focusWindow(), static_cast<QWindow *>(0)); + QTRY_COMPARE(QGuiApplication::focusWindow(), static_cast<QWindow *>(nullptr)); compositor->setKeyboardFocus(surface); QTRY_COMPARE(window.focusInEventCount, 2); @@ -375,7 +375,7 @@ class DndWindow : public QWindow Q_OBJECT public: - DndWindow(QWindow *parent = 0) + DndWindow(QWindow *parent = nullptr) : QWindow(parent) , dragStarted(false) { |