# HG changeset patch
# User Chetan Kapoor <chetank@symbian.org>
# Date 1276697215 -3600
# Node ID 10563c32cc35400fdba9ccfd80fc36b22716cdec
# Parent  5116222d9cb98cbbb34201e24db4519eb9d30a6f# Parent  999a74da228b792102165bebfcf67025220c6266
Merge

diff -r 5116222d9cb9 -r 10563c32cc35 webengine/webkitutils/rt_gesturehelper/src/gesturehelperimpl.cpp
--- a/webengine/webkitutils/rt_gesturehelper/src/gesturehelperimpl.cpp	Wed Jun 16 15:05:41 2010 +0100
+++ b/webengine/webkitutils/rt_gesturehelper/src/gesturehelperimpl.cpp	Wed Jun 16 15:06:55 2010 +0100
@@ -137,12 +137,12 @@
     CGestureHelperImpl* self = new ( ELeave ) CGestureHelperImpl( aObserver );
     CleanupStack::PushL( self );
     self->iEventSender = CGestureEventSender::NewL( aObserver );
-    self->iDoubleTapTimer = CCallbackTimer::NewL( *self, EmitFirstTapEvent, 
+    self->iDoubleTapTimer = CCallbackTimer::NewL( *self, &EmitFirstTapEvent, 
             KMaxTapDuration, EFalse ); // double tap is disabled by default
-    self->iHoldingTimer = CCallbackTimer::NewL( *self, StartHoldingL, 
+    self->iHoldingTimer = CCallbackTimer::NewL( *self, &StartHoldingL, 
         KHoldDuration, EFalse ); // holding is enabled by default
     
-    self->iLongTouchTimer = CCallbackTimer::NewL( *self, HandleLongTouch, 
+    self->iLongTouchTimer = CCallbackTimer::NewL( *self, &HandleLongTouch, 
             KLongTapDuration, ETrue ); // holding is enabled by default
     
     self->iGesture = new ( ELeave ) CGesture();
diff -r 5116222d9cb9 -r 10563c32cc35 webengine/webkitutils/rt_gesturehelper/src/gesturerecogniser.cpp
--- a/webengine/webkitutils/rt_gesturehelper/src/gesturerecogniser.cpp	Wed Jun 16 15:05:41 2010 +0100
+++ b/webengine/webkitutils/rt_gesturehelper/src/gesturerecogniser.cpp	Wed Jun 16 15:06:55 2010 +0100
@@ -182,7 +182,7 @@
 /** @return last direction of dragging */
 inline TGestureCode LastDirection( const TPointArray& aPoints ) 
     {
-    TInt latestPointIndex = LatestCertainPointIndex( aPoints, TPointArray::operator[] );
+    TInt latestPointIndex = LatestCertainPointIndex( aPoints, &TPointArray::operator[] );
     if ( KErrNotFound != latestPointIndex )
         {
         return Direction( aPoints[latestPointIndex], LastPoint( aPoints ) );
@@ -196,7 +196,7 @@
  */
 inline TBool IsTap( const TPointArray& aPoints )
     {
-    return KErrNotFound == LatestCertainPointIndex( aPoints, TPointArray::Raw );
+    return KErrNotFound == LatestCertainPointIndex( aPoints, &TPointArray::Raw );
     }  
     
 // ----------------------------------------------------------------------------
diff -r 5116222d9cb9 -r 10563c32cc35 webengine/widgetinstaller/Src/WidgetInstaller.cpp
--- a/webengine/widgetinstaller/Src/WidgetInstaller.cpp	Wed Jun 16 15:05:41 2010 +0100
+++ b/webengine/widgetinstaller/Src/WidgetInstaller.cpp	Wed Jun 16 15:06:55 2010 +0100
@@ -472,14 +472,16 @@
                     break;
                     
                     case EWidgetPropTypeInt:
-                    TLex toInt( value->Des() );
-                    TInt k;
-                    if ( KErrNone != toInt.Val( k ) )
-                       {
-                       User::Leave( KErrCorrupt );
-                       }
-                    if ( propId ==  EBlanketPermGranted )
-                        backupBlanketPerm = k;        
+                    	{
+		                TLex toInt( value->Des() );
+		                TInt k;
+		                if ( KErrNone != toInt.Val( k ) )
+		                   {
+		                   User::Leave( KErrCorrupt );
+		                   }
+		                if ( propId ==  EBlanketPermGranted )
+		                    backupBlanketPerm = k;
+						}        
                     break;                    
 					          
 					          case EWidgetPropTypeString: