--- 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();
--- 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 );
}
// ----------------------------------------------------------------------------
--- 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: