summaryrefslogtreecommitdiffstats
path: root/src/gui/kernel/qevent.h
diff options
context:
space:
mode:
authorJ-P Nurmi <jpnurmi@digia.com>2013-08-10 15:19:27 +0200
committerThe Qt Project <gerrit-noreply@qt-project.org>2013-08-15 10:02:36 +0200
commit751989df5cc441dcffbbbe2da0c3c0558701d5c6 (patch)
treefaaed4ab993c54924da0be15ec7c090c0041ab18 /src/gui/kernel/qevent.h
parent8e13a9792afcaf1be901ac00418b30372e818fde (diff)
Replace QWheelEvent::Phase with revised Qt::ScrollPhase
Change-Id: I4d8e7d48497d0d96a297191976c0d99feb67b538 Reviewed-by: Shawn Rutledge <shawn.rutledge@digia.com>
Diffstat (limited to 'src/gui/kernel/qevent.h')
-rw-r--r--src/gui/kernel/qevent.h6
1 files changed, 2 insertions, 4 deletions
diff --git a/src/gui/kernel/qevent.h b/src/gui/kernel/qevent.h
index 2de88cf010..0c1cf70420 100644
--- a/src/gui/kernel/qevent.h
+++ b/src/gui/kernel/qevent.h
@@ -167,8 +167,6 @@ protected:
class Q_GUI_EXPORT QWheelEvent : public QInputEvent
{
public:
- enum Phase { Started, Changed, Ended };
-
QWheelEvent(const QPointF &pos, int delta,
Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers,
Qt::Orientation orient = Qt::Vertical);
@@ -180,7 +178,7 @@ public:
Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers);
QWheelEvent(const QPointF &pos, const QPointF& globalPos,
QPoint pixelDelta, QPoint angleDelta, int qt4Delta, Qt::Orientation qt4Orientation,
- Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Phase phase);
+ Qt::MouseButtons buttons, Qt::KeyboardModifiers modifiers, Qt::ScrollPhase phase);
~QWheelEvent();
@@ -204,7 +202,7 @@ public:
inline Qt::MouseButtons buttons() const { return mouseState; }
- inline Phase phase() const { return Phase(ph); }
+ inline Qt::ScrollPhase phase() const { return Qt::ScrollPhase(ph); }
protected:
QPointF p;