Katana_mirror/katie
1
0
Fork 0
mirror of https://bitbucket.org/smil3y/katie.git synced 2025-02-25 11:22:58 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

make translateKeyEventInternal() static, remove unused argument and return value

Browse source 
Signed-off-by: Ivailo Monev <xakepa10@laimg.moc>
This commit is contained in:
Ivailo Monev 2020-04-05 00:40:17 +00:00
parent b4c0f3eaa6
commit 24446f5a94
2 changed files with 11 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/gui/kernel/qkeymapper_p.h
View file

@ -106,15 +106,6 @@ public:
Qt::LayoutDirection keyboardInputDirection; Qt::LayoutDirection keyboardInputDirection;
#if defined(Q_WS_X11) #if defined(Q_WS_X11)
bool translateKeyEventInternal(QWidget *keywidget,
const XEvent *,
KeySym &keysym,
int& count,
QString& text,
Qt::KeyboardModifiers& modifiers,
int &code,
QEvent::Type &type,
bool statefulTranslation = true);
bool translateKeyEvent(QWidget *keywidget, bool translateKeyEvent(QWidget *keywidget,
const XEvent *); const XEvent *);

25
src/gui/kernel/qkeymapper_x11.cpp
View file

@ -869,15 +869,14 @@ static QString translateKeySym(KeySym keysym, uint xmodifiers,
extern bool qt_use_rtl_extensions; // from qapplication_x11.cpp extern bool qt_use_rtl_extensions; // from qapplication_x11.cpp
bool QKeyMapperPrivate::translateKeyEventInternal(QWidget *keyWidget, void static translateKeyEventInternal(QWidget *keyWidget,
const XEvent *event, const XEvent *event,
KeySym &keysym, KeySym &keysym,
int& count, int& count,
QString& text, QString& text,
Qt::KeyboardModifiers &modifiers, Qt::KeyboardModifiers &modifiers,
int& code, int& code,
QEvent::Type &type, QEvent::Type &type)
bool statefulTranslation)
{ {
XKeyEvent xkeyevent = event->xkey; XKeyEvent xkeyevent = event->xkey;
// save the modifier state, we will use the keystate uint later by passing // save the modifier state, we will use the keystate uint later by passing
@ -890,14 +889,14 @@ bool QKeyMapperPrivate::translateKeyEventInternal(QWidget *keyWidget,
static unsigned int lastWinId = 0; static unsigned int lastWinId = 0;
// translate pending direction change // translate pending direction change
if (statefulTranslation && qt_use_rtl_extensions && type == QEvent::KeyRelease) { if (qt_use_rtl_extensions && type == QEvent::KeyRelease) {
if (directionKeyEvent == Qt::Key_Direction_R || directionKeyEvent == Qt::Key_Direction_L) { if (directionKeyEvent == Qt::Key_Direction_R || directionKeyEvent == Qt::Key_Direction_L) {
type = QEvent::KeyPress; type = QEvent::KeyPress;
code = directionKeyEvent; code = directionKeyEvent;
text = QString(); text = QString();
directionKeyEvent = 0; directionKeyEvent = 0;
lastWinId = 0; lastWinId = 0;
return true; return;
} else { } else {
directionKeyEvent = 0; directionKeyEvent = 0;
lastWinId = 0; lastWinId = 0;
@ -920,7 +919,7 @@ bool QKeyMapperPrivate::translateKeyEventInternal(QWidget *keyWidget,
// (to figure out whether the Ctrl modifier is held while Shift is pressed, // (to figure out whether the Ctrl modifier is held while Shift is pressed,
// or Shift is held while Ctrl is pressed) since the 'state' doesn't tell // or Shift is held while Ctrl is pressed) since the 'state' doesn't tell
// us whether the modifier held is Left or Right. // us whether the modifier held is Left or Right.
if (statefulTranslation && qt_use_rtl_extensions && type == QEvent::KeyPress) { if (qt_use_rtl_extensions && type == QEvent::KeyPress) {
if (keysym == XK_Control_L || keysym == XK_Control_R if (keysym == XK_Control_L || keysym == XK_Control_R
|| keysym == XK_Shift_L || keysym == XK_Shift_R) { || keysym == XK_Shift_L || keysym == XK_Shift_R) {
if (!directionKeyEvent) { if (!directionKeyEvent) {
@ -948,8 +947,6 @@ bool QKeyMapperPrivate::translateKeyEventInternal(QWidget *keyWidget,
directionKeyEvent = Qt::Key_Space; // invalid directionKeyEvent = Qt::Key_Space; // invalid
} }
} }
return true;
} }