diff options
Diffstat (limited to 'src/compositor/extensions')
-rw-r--r-- | src/compositor/extensions/qwaylandtextinput.cpp | 6 | ||||
-rw-r--r-- | src/compositor/extensions/qwaylandwlshell.cpp | 2 | ||||
-rw-r--r-- | src/compositor/extensions/qwlqtkey.cpp | 2 | ||||
-rw-r--r-- | src/compositor/extensions/qwlqttouch.cpp | 2 |
4 files changed, 6 insertions, 6 deletions
diff --git a/src/compositor/extensions/qwaylandtextinput.cpp b/src/compositor/extensions/qwaylandtextinput.cpp index 11454da0..552aa066 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) diff --git a/src/compositor/extensions/qwaylandwlshell.cpp b/src/compositor/extensions/qwaylandwlshell.cpp index c588c106..59b31191 100644 --- a/src/compositor/extensions/qwaylandwlshell.cpp +++ b/src/compositor/extensions/qwaylandwlshell.cpp @@ -704,7 +704,7 @@ QWaylandWlShellSurface *QWaylandWlShellSurface::fromResource(wl_resource *resour QWaylandWlShellSurfacePrivate::Resource *res = QWaylandWlShellSurfacePrivate::Resource::fromResource(resource); if (res) return static_cast<QWaylandWlShellSurfacePrivate *>(res->shell_surface_object)->q_func(); - return 0; + return nullptr; } QT_END_NAMESPACE diff --git a/src/compositor/extensions/qwlqtkey.cpp b/src/compositor/extensions/qwlqtkey.cpp index 99f71f14..73d06ae6 100644 --- a/src/compositor/extensions/qwlqtkey.cpp +++ b/src/compositor/extensions/qwlqtkey.cpp @@ -61,7 +61,7 @@ bool QtKeyExtensionGlobal::postQtKeyEvent(QKeyEvent *event, QWaylandSurface *sur if (target) { send_qtkey(target->handle, - surface ? surface->resource() : 0, + surface ? surface->resource() : nullptr, time, event->type(), event->key(), event->modifiers(), event->nativeScanCode(), event->nativeVirtualKey(), diff --git a/src/compositor/extensions/qwlqttouch.cpp b/src/compositor/extensions/qwlqttouch.cpp index 3a0752b8..161ec6c1 100644 --- a/src/compositor/extensions/qwlqttouch.cpp +++ b/src/compositor/extensions/qwlqttouch.cpp @@ -52,7 +52,7 @@ TouchExtensionGlobal::TouchExtensionGlobal(QWaylandCompositor *compositor) : QWaylandCompositorExtensionTemplate(compositor) , QtWaylandServer::qt_touch_extension(compositor->display(), 1) , m_compositor(compositor) - , m_flags(0) + , m_flags(BehaviorFlag::None) , m_resources() , m_posData(maxRawPos * 2) { |