diff options
| author | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-09 16:14:20 (GMT) |
|---|---|---|
| committer | Thiago Macieira <thiago.macieira@nokia.com> | 2009-11-09 16:14:20 (GMT) |
| commit | a8e0e5656f09130e68c10209429a0870b38248c4 (patch) | |
| tree | 9f2c51be485c3f1e4afea821ebbe838a08c0ce2d /tests/manual/gestures/graphicsview/gestures.h | |
| parent | 8fbdbd25015a4e5544dace3a77427861f0ca89f4 (diff) | |
| parent | b770abdd564f28a8d9dde816f72f73e6b15984af (diff) | |
| download | Qt-a8e0e5656f09130e68c10209429a0870b38248c4.zip Qt-a8e0e5656f09130e68c10209429a0870b38248c4.tar.gz Qt-a8e0e5656f09130e68c10209429a0870b38248c4.tar.bz2 | |
Merge branch '4.6' into core-4.6
Diffstat (limited to 'tests/manual/gestures/graphicsview/gestures.h')
| -rw-r--r-- | tests/manual/gestures/graphicsview/gestures.h | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/manual/gestures/graphicsview/gestures.h b/tests/manual/gestures/graphicsview/gestures.h index 6140b12..8a31b71 100644 --- a/tests/manual/gestures/graphicsview/gestures.h +++ b/tests/manual/gestures/graphicsview/gestures.h @@ -59,8 +59,8 @@ public: class ThreeFingerSlideGestureRecognizer : public QGestureRecognizer { private: - QGesture* createGesture(QObject *target); - QGestureRecognizer::Result filterEvent(QGesture *state, QObject *watched, QEvent *event); + QGesture *create(QObject *target); + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event); void reset(QGesture *state); }; @@ -70,8 +70,8 @@ public: RotateGestureRecognizer(); private: - QGesture* createGesture(QObject *target); - QGestureRecognizer::Result filterEvent(QGesture *state, QObject *watched, QEvent *event); + QGesture *create(QObject *target); + QGestureRecognizer::Result recognize(QGesture *state, QObject *watched, QEvent *event); void reset(QGesture *state); }; |