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 /src/compositor/extensions/qwaylandtextinput.cpp | |
| 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 'src/compositor/extensions/qwaylandtextinput.cpp')
| -rw-r--r-- | src/compositor/extensions/qwaylandtextinput.cpp | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/src/compositor/extensions/qwaylandtextinput.cpp b/src/compositor/extensions/qwaylandtextinput.cpp index 11454da06..552aa0667 100644 --- a/src/compositor/extensions/qwaylandtextinput.cpp +++ b/src/compositor/extensions/qwaylandtextinput.cpp @@ -54,7 +54,7 @@ QT_BEGIN_NAMESPACE QWaylandTextInputClientState::QWaylandTextInputClientState() - : hints(0) + : hints(Qt::ImhNone) , cursorRectangle() , surroundingText() , cursorPosition(0) @@ -339,7 +339,7 @@ void QWaylandTextInputPrivate::zwp_text_input_v2_bind_resource(Resource *resourc void QWaylandTextInputPrivate::zwp_text_input_v2_destroy_resource(Resource *resource) { if (focusResource == resource) - focusResource = 0; + focusResource = nullptr; } void QWaylandTextInputPrivate::zwp_text_input_v2_destroy(Resource *resource) @@ -426,7 +426,7 @@ void QWaylandTextInputPrivate::zwp_text_input_v2_set_content_type(Resource *reso if (resource != focusResource) return; - pendingState->hints = 0; + pendingState->hints = Qt::ImhNone; if ((hint & content_hint_auto_completion) == 0 && (hint & content_hint_auto_correction) == 0) |