--- a/phoneapp/phoneuicontrol/inc/cphonenumberentrymanager.h	Sun Mar 14 13:09:36 2010 +0000
+++ b/phoneapp/phoneuicontrol/inc/cphonenumberentrymanager.h	Sun Mar 28 16:36:20 2010 +0100
@@ -53,7 +53,7 @@
         * @param aCbaManager: Handle to cphonecbamanager.
         * @return CPhoneNumberEntryManager* object  
         */
-        static CPhoneNumberEntryManager* CPhoneNumberEntryManager::NewL(
+        static CPhoneNumberEntryManager* NewL(
                     CPhoneState* aState,
                     MPhoneViewCommandHandle& aViewCommandHandle,
                     MPhoneStateMachine& aStateMachine,

--- a/phoneapp/phoneuiview/inc/cphonedtmfnumberlistquery.h	Sun Mar 14 13:09:36 2010 +0000
+++ b/phoneapp/phoneuiview/inc/cphonedtmfnumberlistquery.h	Sun Mar 28 16:36:20 2010 +0100
@@ -49,9 +49,9 @@
         * @return CPhoneDtmfNumberListQuery* object  
         */
         static CPhoneDtmfNumberListQuery* 
-            CPhoneDtmfNumberListQuery::NewL( MEikCommandObserver& aCommandObserver,
-                                             MPhoneQueryObserver& aQueryObserver,
-                                             HBufC*& aSelectedDtmfNumber );
+            NewL( MEikCommandObserver& aCommandObserver,
+                  MPhoneQueryObserver& aQueryObserver,
+                  HBufC*& aSelectedDtmfNumber );
         
         /**
         * Destructor.

--- a/phoneengine/PhoneCntFinder/ContactService/inc/cphcntphonebookservices.h	Sun Mar 14 13:09:36 2010 +0000
+++ b/phoneengine/PhoneCntFinder/ContactService/inc/cphcntphonebookservices.h	Sun Mar 28 16:36:20 2010 +0100
@@ -117,7 +117,7 @@
      * @since S60 v3.2
      * @see MPhCntPhonebookServices
      */
-    void CPhCntPhonebookServices::GetPhoneNumberL(
+    void GetPhoneNumberL(
 	    const TDesC8& aContactLink,
 	    const CPhCntSingleItemFetch::TCallType aCallType,
     	HBufC*& aNumber,

--- a/phoneengine/phonemodel/inc/cpeparsersshandler.h	Sun Mar 14 13:09:36 2010 +0000
+++ b/phoneengine/phonemodel/inc/cpeparsersshandler.h	Sun Mar 28 16:36:20 2010 +0100
@@ -233,22 +233,22 @@
         /**
         * Create call barring observer
         */
-        void CPEParserSSHandler::CreateCBObsL();
+        void CreateCBObsL();
     
         /**
         * Create call cli observer
         */
-        void CPEParserSSHandler::CreateCliObsL();          
+        void CreateCliObsL();          
         
         /**
         * Create call divert observer
         */
-        void CPEParserSSHandler::CreateCFObsL();
+        void CreateCFObsL();
 
         /**
         * Create call waiting observer
         */
-        void CPEParserSSHandler::CreateCWObsL();
+        void CreateCWObsL();
 
         /**
         * if ConnectSsToEngine leaves, this is called

--- a/phonesettings/pslncallimageplugin/inc/PslnCallImagePluginDRM.h	Sun Mar 14 13:09:36 2010 +0000
+++ b/phonesettings/pslncallimageplugin/inc/PslnCallImagePluginDRM.h	Sun Mar 28 16:36:20 2010 +0100
@@ -68,7 +68,7 @@
         */
         void ConstructL();
 
-        void CPslnCallImagePluginDRM::ShowErrorNoteL( TInt  aResourceId  ) const;
+        void ShowErrorNoteL( TInt  aResourceId  ) const;
 
     private:    // Data
     

--- a/phoneuis/BubbleManager/Inc/BMBubbleOutlookConference.h	Sun Mar 14 13:09:36 2010 +0000
+++ b/phoneuis/BubbleManager/Inc/BMBubbleOutlookConference.h	Sun Mar 28 16:36:20 2010 +0100
@@ -137,8 +137,7 @@
        /**
         * From CCoeControl
         */ 
-        void CBubbleOutlookConference::HandlePointerEventL
-            ( const TPointerEvent& aPointerEvent );
+        void HandlePointerEventL( const TPointerEvent& aPointerEvent );
 
     private:
     

--- a/phoneuis/TelephonyDeviceMode/inc/CTelDMGripHandler.h	Sun Mar 14 13:09:36 2010 +0000
+++ b/phoneuis/TelephonyDeviceMode/inc/CTelDMGripHandler.h	Sun Mar 28 16:36:20 2010 +0100
@@ -111,7 +111,7 @@
         * @param aValue the value associated with the central repository ID
         * @return
         */
-        TInt CTelDMGripHandler::GetInt( 
+        TInt GetInt( 
             const TUid& aUid, 
             const TUint aId,
             TInt& aValue ) const;