diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-03-26 07:24:39 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-03-26 07:24:39 (GMT) |
| commit | b2824b384485ddba95091e49f81733485f1a73be (patch) | |
| tree | 6ab9c9e3c3d12b60d428d9bf109d6ede13a2d256 | |
| parent | 5b49972137585853e017b0e3055d2fbd548d174d (diff) | |
| download | Qt-b2824b384485ddba95091e49f81733485f1a73be.zip Qt-b2824b384485ddba95091e49f81733485f1a73be.tar.gz Qt-b2824b384485ddba95091e49f81733485f1a73be.tar.bz2 | |
remove QApplicationPrivate::sendTouchEvent
| -rw-r--r-- | src/gui/kernel/qapplication_p.h | 2 | ||||
| -rw-r--r-- | src/gui/kernel/qapplication_win.cpp | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/src/gui/kernel/qapplication_p.h b/src/gui/kernel/qapplication_p.h index ccd9f41..ce7110d 100644 --- a/src/gui/kernel/qapplication_p.h +++ b/src/gui/kernel/qapplication_p.h @@ -440,8 +440,6 @@ public: QVector<QTouchEvent::TouchPoint *> allTouchPoints; QList<QTouchEvent::TouchPoint *> currentTouchPoints, activeTouchPoints; - static bool sendTouchEvent(QWidget *widget, QTouchEvent *touchEvent); - void initializeMultitouch(); void insertActiveTouch(QTouchEvent::TouchPoint *touchPoint); void removeActiveTouch(QTouchEvent::TouchPoint *touchPoint); diff --git a/src/gui/kernel/qapplication_win.cpp b/src/gui/kernel/qapplication_win.cpp index 7c7f7f6..cef8cf2 100644 --- a/src/gui/kernel/qapplication_win.cpp +++ b/src/gui/kernel/qapplication_win.cpp @@ -4133,16 +4133,12 @@ bool QApplicationPrivate::translateTouchEvent(const MSG &msg) : QEvent::TouchUpdate), q->keyboardModifiers(), activeTouchPoints); updateTouchPointsForWidget(widget, &touchEvent); - return (qt_tabletChokeMouse = sendTouchEvent(widget, &touchEvent)); + + bool res = QApplication::sendSpontaneousEvent(widget, &touchEvent); + return (qt_tabletChokeMouse = res && touchEvent.isAccepted()); } return false; } -bool QApplicationPrivate::sendTouchEvent(QWidget *widget, QTouchEvent *touchEvent) -{ - bool res = QApplication::sendSpontaneousEvent(widget, touchEvent); - return res && touchEvent->isAccepted(); -} - QT_END_NAMESPACE |