summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGatis Paeglis <gatis.paeglis@qt.io>2019-01-24 13:49:10 +0100
committerGatis Paeglis <gatis.paeglis@qt.io>2019-04-25 09:17:16 +0000
commitf533c767b2b5955ae8f242da7c8c11ad18ba0181 (patch)
treef01314672418b6774a091d43f345038e38a15cc0
parent23453c30084d09d7325e113bbc3d0637c51cb3e7 (diff)
remove useless indirection
The function name also was not the best :) Change-Id: Iee853a77ac0ad210f2dff70b55df2ba534fd355b Reviewed-by: Johan Helsing <johan.helsing@qt.io>
-rw-r--r--src/compositor/compositor_api/qwaylandkeyboard.cpp13
-rw-r--r--src/compositor/compositor_api/qwaylandkeyboard_p.h2
2 files changed, 4 insertions, 11 deletions
diff --git a/src/compositor/compositor_api/qwaylandkeyboard.cpp b/src/compositor/compositor_api/qwaylandkeyboard.cpp
index ffe536ce3..2302c0b6a 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard.cpp
+++ b/src/compositor/compositor_api/qwaylandkeyboard.cpp
@@ -180,14 +180,6 @@ void QWaylandKeyboardPrivate::sendKeyEvent(uint code, uint32_t state)
send_key(focusResource->handle, serial, time, key, state);
}
-void QWaylandKeyboardPrivate::modifiers(uint32_t serial, uint32_t mods_depressed,
- uint32_t mods_latched, uint32_t mods_locked, uint32_t group)
-{
- if (focusResource) {
- send_modifiers(focusResource->handle, serial, mods_depressed, mods_latched, mods_locked, group);
- }
-}
-
#if QT_CONFIG(xkbcommon)
void QWaylandKeyboardPrivate::maybeUpdateXkbScanCodeTable()
{
@@ -238,7 +230,10 @@ void QWaylandKeyboardPrivate::updateModifierState(uint code, uint32_t state)
this->modsLocked = modsLocked;
this->group = group;
- modifiers(compositor()->nextSerial(), modsDepressed, modsLatched, modsLocked, group);
+ if (focusResource) {
+ send_modifiers(focusResource->handle, compositor()->nextSerial(), modsDepressed,
+ modsLatched, modsLocked, group);
+ }
#else
Q_UNUSED(code);
Q_UNUSED(state);
diff --git a/src/compositor/compositor_api/qwaylandkeyboard_p.h b/src/compositor/compositor_api/qwaylandkeyboard_p.h
index fb3f5fe34..4dfe0035e 100644
--- a/src/compositor/compositor_api/qwaylandkeyboard_p.h
+++ b/src/compositor/compositor_api/qwaylandkeyboard_p.h
@@ -85,8 +85,6 @@ public:
QWaylandCompositor *compositor() const { return seat->compositor(); }
void focused(QWaylandSurface* surface);
- void modifiers(uint32_t serial, uint32_t mods_depressed,
- uint32_t mods_latched, uint32_t mods_locked, uint32_t group);
#if QT_CONFIG(xkbcommon)
struct xkb_state *xkbState() const { return mXkbState.get(); }