# HG changeset patch
# User Peter Fordham <peter.fordham@gmail.com>
# Date 1267835670 28800
# Node ID b218e21343003f9dbe400fd0706811ddd8fdd79d
# Parent  0209b90930827b7c90be0101ab6c70d85c6c0d1c
Bug 2167 - Specify member function pointers more consistently for GCC

diff -r 0209b9093082 -r b218e2134300 webengine/osswebengine/WebCore/platform/symbian/FormFillController.cpp
--- a/webengine/osswebengine/WebCore/platform/symbian/FormFillController.cpp	Fri Mar 05 16:30:46 2010 -0800
+++ b/webengine/osswebengine/WebCore/platform/symbian/FormFillController.cpp	Fri Mar 05 16:34:30 2010 -0800
@@ -43,7 +43,7 @@
 FormFillController::FormFillController() 
                     : m_popup(0), m_callback(0), m_inputElement(0), m_formDB(0), m_passwdDB(0)
 {
-    m_searchTimer = new Timer<FormFillController>(this, FormFillController::fireSearch);
+    m_searchTimer = new Timer<FormFillController>(this, &FormFillController::fireSearch);
 }
 
 FormFillController::~FormFillController()
diff -r 0209b9093082 -r b218e2134300 webengine/pagescaler/src/minimap.cpp
--- a/webengine/pagescaler/src/minimap.cpp	Fri Mar 05 16:30:46 2010 -0800
+++ b/webengine/pagescaler/src/minimap.cpp	Fri Mar 05 16:34:30 2010 -0800
@@ -118,10 +118,10 @@
 void CMinimap::ConstructL()
     {
     iGenerator = CMinimapGenerator::NewL(*this);
-    iUpdateCbTimer = CMinimapTimer::NewL(*this, &UpdateCbTimerCbL, CActive::EPriorityStandard - 1 );
-    iUpdateTimer = CMinimapTimer::NewL(*this, &UpdateTimerCbL);
-    iVisibilityTimer = CMinimapTimer::NewL(*this, &VisibilityTimerCbL);
-    iFadeTimer = CMinimapTimer::NewL(*this, &UpdateTransparency);
+    iUpdateCbTimer = CMinimapTimer::NewL(*this, &CMinimap::UpdateCbTimerCbL, CActive::EPriorityStandard - 1 );
+    iUpdateTimer = CMinimapTimer::NewL(*this, &CMinimap::UpdateTimerCbL);
+    iVisibilityTimer = CMinimapTimer::NewL(*this, &CMinimap::VisibilityTimerCbL);
+    iFadeTimer = CMinimapTimer::NewL(*this, &CMinimap::UpdateTransparency);
     SetRelativePosition(KDefaultOffsetX,KDefaultOffsetY,KDefaultPosition);
     }
 
diff -r 0209b9093082 -r b218e2134300 webengine/webkitutils/stmgesturefw/src/statemachine.cpp
--- a/webengine/webkitutils/stmgesturefw/src/statemachine.cpp	Fri Mar 05 16:30:46 2010 -0800
+++ b/webengine/webkitutils/stmgesturefw/src/statemachine.cpp	Fri Mar 05 16:34:30 2010 -0800
@@ -155,9 +155,9 @@
     for (int i = 0; i < KMaxNumberOfPointers; i++)
     {
         m_impl[i] = new(ELeave) CStateEngine(m_config, this, i) ;
-        m_holdTimer[i] = CCallbackTimer::NewL(*this, handleholdTimer, 0, i, ETrue);
-        m_touchTimer[i] = CCallbackTimer::NewL(*this, handletouchTimer, 0, i, ETrue);
-        m_suppressTimer[i] = CCallbackTimer::NewL(*this, handlesuppressTimer, 0, i, ETrue);
+        m_holdTimer[i] = CCallbackTimer::NewL(*this, &CStateMachine::handleholdTimer, 0, i, ETrue);
+        m_touchTimer[i] = CCallbackTimer::NewL(*this, &CStateMachine::handletouchTimer, 0, i, ETrue);
+        m_suppressTimer[i] = CCallbackTimer::NewL(*this, &CStateMachine::handlesuppressTimer, 0, i, ETrue);
     }
 
     m_coeEnv = CCoeEnv::Static();