diff -r dd21522fd290 -r 7c90e6132015 webengine/webkitutils/rt_gesturehelper/src/gesture.cpp --- a/webengine/webkitutils/rt_gesturehelper/src/gesture.cpp Mon Mar 30 12:54:55 2009 +0300 +++ b/webengine/webkitutils/rt_gesturehelper/src/gesture.cpp Fri May 08 08:25:06 2009 +0300 @@ -73,7 +73,7 @@ * @return gesture code by analysing the sequence of points */ TGestureCode CodeFromPoints( const RArray< TPointEntry >& aPoints, - MGestureEvent::TAxis aRelevantAxis ) + TAxis aRelevantAxis ) { // select the correct filter based on aRelevantAxis // these filter_ objects are array decorators that will eliminate either @@ -82,8 +82,8 @@ TYAxisPointArray filterX( aPoints ); TPointArray filterNone( aPoints ); TPointArray& filter = - aRelevantAxis == MGestureEvent::EAxisHorizontal ? static_cast< TPointArray& >( filterY ) : - aRelevantAxis == MGestureEvent::EAxisVertical ? static_cast< TPointArray& >( filterX ) : + aRelevantAxis == EAxisHorizontal ? static_cast< TPointArray& >( filterY ) : + aRelevantAxis == EAxisVertical ? static_cast< TPointArray& >( filterX ) : /* otherwise EAxisBoth */ filterNone; // currently the gesture recogniser does not have any state, so it is fast @@ -126,7 +126,6 @@ iHoldingState = ENotHolding; iState = ENotComplete; iHoldingPointIndex = 0; - iVisual = NULL; iIsDoubleTap = EFalse; iIsLongTap = EFalse; } @@ -157,10 +156,7 @@ // SetVisual // ---------------------------------------------------------------------------- // -void CGesture::SetVisual( CAlfVisual* aVisual ) - { - iVisual = aVisual; - } + // ---------------------------------------------------------------------------- // IsNearHoldingPoint @@ -273,7 +269,7 @@ // TBool CGesture::IsTap() const { - return CodeFromPoints( iPoints, MGestureEvent::EAxisBoth ) == EGestureTap; + return CodeFromPoints( iPoints, EAxisBoth ) == EGestureTap; } /** @@ -297,7 +293,7 @@ // Code // ---------------------------------------------------------------------------- // -TGestureCode CGesture::Code( MGestureEvent::TAxis aRelevantAxis ) /* const */ +TGestureCode CGesture::Code( TAxis aRelevantAxis ) /* const */ { TGestureCode code; @@ -686,10 +682,6 @@ // Visual // ---------------------------------------------------------------------------- // -CAlfVisual* CGesture::Visual() const - { - return iVisual; - } // ---------------------------------------------------------------------------- // TimeFromPreviousPoint