diff options
| author | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-08-08 21:58:46 (GMT) |
|---|---|---|
| committer | Denis Dzyubenko <denis.dzyubenko@nokia.com> | 2009-08-10 12:21:27 (GMT) |
| commit | 47f58dfad1eb7fe61a523597023df33f3d320377 (patch) | |
| tree | a4ddbe867d47a97a0d2cef5984d0e8302a83bca7 | |
| parent | 17bffacda99055831bb4c8c6e7da39ec15415519 (diff) | |
| download | Qt-47f58dfad1eb7fe61a523597023df33f3d320377.zip Qt-47f58dfad1eb7fe61a523597023df33f3d320377.tar.gz Qt-47f58dfad1eb7fe61a523597023df33f3d320377.tar.bz2 | |
Made the QGesture::reset function protected.
By default the QGesture::reset function is protected, and it can be made public
in the derived class if necessary.
Reviewed-by: trustme
| -rw-r--r-- | src/gui/kernel/qgesture.h | 3 | ||||
| -rw-r--r-- | src/gui/kernel/qstandardgestures.h | 4 |
2 files changed, 4 insertions, 3 deletions
diff --git a/src/gui/kernel/qgesture.h b/src/gui/kernel/qgesture.h index 7da37c4..839fdca 100644 --- a/src/gui/kernel/qgesture.h +++ b/src/gui/kernel/qgesture.h @@ -73,14 +73,13 @@ public: void setGraphicsItem(QGraphicsItem *); QGraphicsItem *graphicsItem() const; - virtual void reset(); - Qt::GestureState state() const; protected: QGesture(QGesturePrivate &dd, QObject *parent); bool eventFilter(QObject*, QEvent*); + virtual void reset(); void updateState(Qt::GestureState state); Q_SIGNALS: diff --git a/src/gui/kernel/qstandardgestures.h b/src/gui/kernel/qstandardgestures.h index c734fba..03a1374 100644 --- a/src/gui/kernel/qstandardgestures.h +++ b/src/gui/kernel/qstandardgestures.h @@ -66,11 +66,13 @@ public: QPanGesture(QWidget *parent); bool filterEvent(QEvent *event); - void reset(); QSize totalOffset() const; QSize lastOffset() const; +protected: + void reset(); + private: bool event(QEvent *event); bool eventFilter(QObject *receiver, QEvent *event); |