diff options
| author | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-11 12:00:50 (GMT) |
|---|---|---|
| committer | Bradley T. Hughes <bradley.hughes@nokia.com> | 2009-06-11 12:00:50 (GMT) |
| commit | ecc7f07e612bf156afb7fa2dbcbd2288b9b32e79 (patch) | |
| tree | 88bbdcb558ef7337d3d3621b3b706f004505c569 /src/corelib | |
| parent | 666299f9074235185aa7372729c84a2639224601 (diff) | |
| download | Qt-ecc7f07e612bf156afb7fa2dbcbd2288b9b32e79.zip Qt-ecc7f07e612bf156afb7fa2dbcbd2288b9b32e79.tar.gz Qt-ecc7f07e612bf156afb7fa2dbcbd2288b9b32e79.tar.bz2 | |
remove duplicated code and API (merge QTouchEvent and QGraphicsSceneTouchEvent)
the API for these 2 classes is identical, the implementation is almost
identical, they share the same data structures, so bite the bullet and
merge them.
this means we go back to using screenPos() instead of globalPos()
again
Diffstat (limited to 'src/corelib')
| -rw-r--r-- | src/corelib/kernel/qcoreevent.cpp | 3 | ||||
| -rw-r--r-- | src/corelib/kernel/qcoreevent.h | 7 |
2 files changed, 2 insertions, 8 deletions
diff --git a/src/corelib/kernel/qcoreevent.cpp b/src/corelib/kernel/qcoreevent.cpp index d28d34e..68d05ea 100644 --- a/src/corelib/kernel/qcoreevent.cpp +++ b/src/corelib/kernel/qcoreevent.cpp @@ -226,9 +226,6 @@ QT_BEGIN_NAMESPACE \value TouchBegin Beginning of a sequence of touch-screen and/or track-pad events (QTouchEvent) \value TouchUpdate Touch-screen event (QTouchEvent) \value TouchEnd End of touch-event sequence (QTouchEvent) - \value GraphicsSceneTouchBegin Beginning of a sequence of touch-screen and/or track-pad events in a graphics scene (QGraphicsSceneTouchEvent) - \value GraphicsSceneTouchUpdate Touch-screen event in a graphics scene (QGraphicsSceneTouchEvent) - \value GraphicsSceneTouchEnd End of touch-event sequence in a graphics scene (QGraphicsSceneTouchEvent) \value Gesture A gesture has occured. \value GraphicsSceneGesture A gesture has occured on a graphics scene. diff --git a/src/corelib/kernel/qcoreevent.h b/src/corelib/kernel/qcoreevent.h index feefd08..2f80db6 100644 --- a/src/corelib/kernel/qcoreevent.h +++ b/src/corelib/kernel/qcoreevent.h @@ -275,12 +275,9 @@ public: TouchBegin = 194, TouchUpdate = 195, TouchEnd = 196, - GraphicsSceneTouchBegin = 197, - GraphicsSceneTouchUpdate = 198, - GraphicsSceneTouchEnd = 199, - Gesture = 200, - GraphicsSceneGesture = 201, + Gesture = 197, + GraphicsSceneGesture = 198, // 512 reserved for Qt Jambi's MetaCall event // 513 reserved for Qt Jambi's DeleteOnMainThread event |