summaryrefslogtreecommitdiffstats
path: root/src/kernel/qapplication_x11.cpp
diff options
context:
space:
mode:
authorTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-08-08 17:42:40 -0500
committerTimothy Pearson <kb9vqf@pearsoncomputing.net>2012-08-08 17:42:40 -0500
commitb6053b1b40b51e3d9b1b679a8a1751e5472e06e2 (patch)
treea327afc6092b7c368e80e6b79dccbfd80a1567b3 /src/kernel/qapplication_x11.cpp
parent43db215f601fd50f1fd8b502fae30c75c1bdee4a (diff)
downloadtqt3-b6053b1b40b51e3d9b1b679a8a1751e5472e06e2.tar.gz
tqt3-b6053b1b40b51e3d9b1b679a8a1751e5472e06e2.zip
Automated update from Qt3
Diffstat (limited to 'src/kernel/qapplication_x11.cpp')
-rw-r--r--src/kernel/qapplication_x11.cpp6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/kernel/qapplication_x11.cpp b/src/kernel/qapplication_x11.cpp
index 03e7a779..aba4fcd5 100644
--- a/src/kernel/qapplication_x11.cpp
+++ b/src/kernel/qapplication_x11.cpp
@@ -4445,7 +4445,9 @@ bool TQETWidget::translateXinputEvent( const XEvent *ev )
TQPair<int, int> tId;
XEvent xinputMotionEvent;
XEvent mouseMotionEvent;
+#if defined (Q_OS_IRIX)
XDevice *dev;
+#endif
const XDeviceMotionEvent *motion = 0;
XDeviceButtonEvent *button = 0;
TQEvent::Type t;
@@ -4501,18 +4503,14 @@ bool TQETWidget::translateXinputEvent( const XEvent *ev )
#else
if ( ev->type == xinput_motion ) {
if ( motion->deviceid == devStylus->device_id ) {
- dev = devStylus;
deviceType = TQTabletEvent::Stylus;
} else if ( motion->deviceid == devEraser->device_id ) {
- dev = devEraser;
deviceType = TQTabletEvent::Eraser;
}
} else {
if ( button->deviceid == devStylus->device_id ) {
- dev = devStylus;
deviceType = TQTabletEvent::Stylus;
} else if ( button->deviceid == devEraser->device_id ) {
- dev = devEraser;
deviceType = TQTabletEvent::Eraser;
}
}