From 9818f4a4e524c21d6ac330d3fceb3a4b896c00c2 Mon Sep 17 00:00:00 2001 From: Rodney Dawes Date: Thu, 30 Sep 2021 17:04:45 -0400 Subject: [PATCH] InputMethod: Update for kwayland-server API change with keysym events To avoid needless conversion of modifiers in kwayland-server, we needed to break API so that the modifiers are simply passed through. --- src/inputmethod.cpp | 2 +- src/inputmethod.h | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/inputmethod.cpp b/src/inputmethod.cpp index d05349c133..e625f8da67 100644 --- a/src/inputmethod.cpp +++ b/src/inputmethod.cpp @@ -363,7 +363,7 @@ static quint32 keysymToKeycode(quint32 sym) } } -void InputMethod::keysymReceived(quint32 serial, quint32 time, quint32 sym, bool pressed, Qt::KeyboardModifiers modifiers) +void InputMethod::keysymReceived(quint32 serial, quint32 time, quint32 sym, bool pressed, quint32 modifiers) { Q_UNUSED(serial) Q_UNUSED(time) diff --git a/src/inputmethod.h b/src/inputmethod.h index 77fcfae908..b14999ea96 100644 --- a/src/inputmethod.h +++ b/src/inputmethod.h @@ -83,7 +83,7 @@ private: void updateInputPanelState(); void adoptInputMethodContext(); void commitString(qint32 serial, const QString &text); - void keysymReceived(quint32 serial, quint32 time, quint32 sym, bool pressed, Qt::KeyboardModifiers modifiers); + void keysymReceived(quint32 serial, quint32 time, quint32 sym, bool pressed, quint32 modifiers); void deleteSurroundingText(int32_t index, uint32_t length); void setCursorPosition(qint32 index, qint32 anchor); void setLanguage(uint32_t serial, const QString &language);