diff -r 6297cdf66332 -r d39add9822e2 webengine/osswebengine/WebKit/s60/webview/WebPageScrollHandler.h --- a/webengine/osswebengine/WebKit/s60/webview/WebPageScrollHandler.h Mon Jan 18 21:20:18 2010 +0200 +++ b/webengine/osswebengine/WebKit/s60/webview/WebPageScrollHandler.h Tue Feb 02 00:56:45 2010 +0200 @@ -24,7 +24,7 @@ #include #include #include -#include +#include #include "WebScrollingDecelerator.h" @@ -180,9 +180,9 @@ static int pageOverviewScrollCallback( TAny* aPtr ); //static int handleScrollTimerEventCallback( TAny* ptr); void scrollPageOverviewGH(); - void handleScrollingGH(const RT_GestureHelper::TGestureEvent& aEvent); - void handleTouchDownGH(const RT_GestureHelper::TGestureEvent& aEvent); - void handleTouchUpGH(const RT_GestureHelper::TGestureEvent& aEvent); + void handleScrollingGH(const TStmGestureEvent& aGesture); + void handleTouchDownGH(const TStmGestureEvent& aGesture); + void handleTouchUpGH(const TStmGestureEvent& aGesture); void updateScrollbars(const TPoint& scrollPos, TPoint& newscrollDelta); public: @@ -193,7 +193,7 @@ bool calculateScrollableElement(const TPoint& aNewPosition); void scrollPageOverview(const TPointerEvent& pointerEvent); - bool startDeceleration(const RT_GestureHelper::TGestureEvent& aEvent); + bool startDeceleration(const TStmGestureEvent& aGesture); private: // Pointer to owning view