summaryrefslogtreecommitdiffstats
path: root/src/kernel/qapplication_x11.cpp
diff options
context:
space:
mode:
authorDarrell Anderson <humanreadable@yahoo.com>2012-10-19 22:51:12 -0500
committerDarrell Anderson <humanreadable@yahoo.com>2012-10-19 22:51:12 -0500
commitf175db0cdb14fe5e62b3fbdc785cd3b09576ef1d (patch)
tree8b690a0a04d4143e087324a425621cd12b38d8f1 /src/kernel/qapplication_x11.cpp
parent41e5b784ee48d2cb403bb551bcbe7cbd322c4336 (diff)
parent4037eb7e84eda2b72a456cf7ff19182c2d4a1f7a (diff)
downloadqt3-f175db0cdb14fe5e62b3fbdc785cd3b09576ef1d.tar.gz
qt3-f175db0cdb14fe5e62b3fbdc785cd3b09576ef1d.zip
Merge branch 'master' of http://scm.trinitydesktop.org/scm/git/qt3
Diffstat (limited to 'src/kernel/qapplication_x11.cpp')
-rw-r--r--src/kernel/qapplication_x11.cpp4
1 files changed, 0 insertions, 4 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 6a68604..2873b9e 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -5184,8 +5184,6 @@ bool QETWidget::translateKeyEventInternal( const XEvent *event, int& count,
qAddPostRoutine( deleteKeyDicts );
}
- QWidget* tlw = topLevelWidget();
-
XKeyEvent xkeyevent = event->xkey;
// save the modifier state, we will use the keystate uint later by passing
@@ -5211,7 +5209,6 @@ bool QETWidget::translateKeyEventInternal( const XEvent *event, int& count,
// Implementation for X11R5 and newer, using XIM
int keycode = event->xkey.keycode;
- Status status;
if ( type == QEvent::KeyPress ) {
bool mb=FALSE;
@@ -5295,7 +5292,6 @@ bool QETWidget::translateKeyEventInternal( const XEvent *event, int& count,
// and independent of whether char is signed or not.
textDict->replace( keycode, (void*)(long)(256+ascii) );
}
- tlw = 0;
} else {
key = (int)(long)keyDict->find( keycode );
if ( key )