diff -r 16d8024aca5e -r f7ac710697a9 src/hbcore/gui/hbscrollarea.h --- a/src/hbcore/gui/hbscrollarea.h Mon Apr 19 14:02:13 2010 +0300 +++ b/src/hbcore/gui/hbscrollarea.h Mon May 03 12:48:33 2010 +0300 @@ -32,6 +32,10 @@ class HbGestureSceneFilter; class HbScrollBar; +#ifdef HB_GESTURE_FW +class QPanGesture; +#endif + class HB_CORE_EXPORT HbScrollArea : public HbWidget { @@ -116,9 +120,8 @@ void scrollContentsTo (const QPointF &newPosition, int time = 0); protected: - HbScrollArea(HbScrollAreaPrivate &dd, QGraphicsItem *parent); + HbScrollArea(HbScrollAreaPrivate &dd, QGraphicsItem *parent); virtual void mousePressEvent(QGraphicsSceneMouseEvent *event); - virtual void mouseReleaseEvent(QGraphicsSceneMouseEvent *event); virtual QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const; virtual QVariant itemChange(GraphicsItemChange change, const QVariant &value); virtual bool event(QEvent *event); @@ -126,12 +129,14 @@ virtual bool scrollByAmount(const QPointF &delta); virtual void polish(HbStyleParameters ¶ms); virtual bool eventFilter(QObject *obj, QEvent *event); +#ifdef HB_GESTURE_FW + virtual void gestureEvent(QGestureEvent *event); +#endif signals: void scrollingStarted(); void scrollingEnded(); void scrollDirectionsChanged(Qt::Orientations newValue); - void gestureSceneFilterChanged(HbGestureSceneFilter *newFilter); void scrollPositionChanged(const QPointF &newPosition); protected slots: @@ -148,8 +153,8 @@ Q_PRIVATE_SLOT(d_func(), void _q_hideScrollBars()) Q_PRIVATE_SLOT(d_func(), void _q_thumbPositionChanged(qreal value, Qt::Orientation orientation)) Q_PRIVATE_SLOT(d_func(), void _q_groovePressed(qreal value, Qt::Orientation orientation)) - - + Q_PRIVATE_SLOT(d_func(), void _q_thumbPressed()) + Q_PRIVATE_SLOT(d_func(), void _q_thumbReleased()) }; #endif // HBSCROLLAREA_H