diff -r 6bcf277166c1 -r 451b2e1545b2 radioapp/radiowidgets/inc/radiostripbase.h --- a/radioapp/radiowidgets/inc/radiostripbase.h Fri Jun 11 16:24:13 2010 +0100 +++ b/radioapp/radiowidgets/inc/radiostripbase.h Thu Jul 22 16:33:45 2010 +0100 @@ -29,7 +29,7 @@ class RadioStripBase : public HbScrollArea { Q_OBJECT - Q_PROPERTY( int autoScrollTime READ autoScrollTime WRITE setAutoScrollTime ) + Q_PROPERTY(int autoScrollTime READ autoScrollTime WRITE setAutoScrollTime) public: @@ -42,7 +42,7 @@ QAbstractItemModel* model() const; void setCyclic( bool isCyclic ); - void setSpacing( qreal spacing ); + void setOverlap( qreal overlap ); void setAutoCenter( bool autoCenter ); void setItemSize( const QSizeF& size ); void setIndex( int index, bool animateToCenter ); @@ -60,18 +60,18 @@ void mousePressEvent( QGraphicsSceneMouseEvent* event ); void mouseReleaseEvent( QGraphicsSceneMouseEvent* event ); -private slots: - - void scrollPositionChanged( QPointF newPosition ); - private: Q_DISABLE_COPY( RadioStripBase ) +// from base class HbScrollArea + + bool scrollByAmount( const QPointF& delta ); + virtual void updateItemPrimitive( QGraphicsItem* itemToUpdate, int itemIndex ) = 0; virtual QGraphicsItem* createItemPrimitive( QGraphicsItem *parent ) = 0; - virtual void scrollPosChanged( QPointF newPosition ) = 0; + virtual void scrollPosChanged() = 0; void moveAllItemsToPool(); @@ -104,7 +104,7 @@ bool mIsCyclic; bool mAutoCenter; - qreal mSpacing; + qreal mOverlap; QSizeF mItemSize;