--- a/basiclocationinfodisplay/blid/ui/inc/CBlidMainView.h	Sun Mar 14 13:09:03 2010 +0000
+++ b/basiclocationinfodisplay/blid/ui/inc/CBlidMainView.h	Sun Mar 28 16:36:00 2010 +0100
@@ -78,7 +78,7 @@
         void HandleResourceChangeL( TInt aType );        
 
 		#ifdef RD_SCALABLE_UI_V2
-		void CBlidMainView::HandleListBoxSelectionL();
+		void HandleListBoxSelectionL();
 		#endif //RD_SCALABLE_UI_V2
 		
     public: //From MBlidEngObserver

--- a/basiclocationinfodisplay/blid/ui/inc/CBlidSatelliteView.h	Sun Mar 14 13:09:03 2010 +0000
+++ b/basiclocationinfodisplay/blid/ui/inc/CBlidSatelliteView.h	Sun Mar 28 16:36:00 2010 +0100
@@ -75,7 +75,7 @@
         void HandleResourceChangeL( TInt aType );
 
 		#ifdef RD_SCALABLE_UI_V2
-		void CBlidSatelliteView::HandleListBoxSelectionL();
+		void HandleListBoxSelectionL();
 		#endif //RD_SCALABLE_UI_V2
 		
     public: //From MBlidEngObserver

--- a/eventsui/eventsengine/inc/evtmgmtuilbtadapter.h	Sun Mar 14 13:09:03 2010 +0000
+++ b/eventsui/eventsengine/inc/evtmgmtuilbtadapter.h	Sun Mar 28 16:36:00 2010 +0100
@@ -333,7 +333,7 @@
          * @param [in] aCenter - location of the trigger.
          * @param [out] CLbtTriggerConditionArea - Condition Area for Trigger.
          */
-        CLbtTriggerConditionArea* CEvtMgmtUiLbtAdapter::GetConditionAreaL( 
+        CLbtTriggerConditionArea* GetConditionAreaL( 
                         const TCoordinate& aCenter,
                         TReal aRadiusInKiloMeters );
     private:

--- a/eventsui/eventsmgmtui/inc/evtmgmtuiappui.h	Sun Mar 14 13:09:03 2010 +0000
+++ b/eventsui/eventsmgmtui/inc/evtmgmtuiappui.h	Sun Mar 28 16:36:00 2010 +0100
@@ -77,7 +77,7 @@
     /**
      * Retrieve the application specific status pane
      */
-    CEikStatusPane* CEvtMgmtUiAppUi::StatusPane();
+    CEikStatusPane* StatusPane();
     
     /**
      * Legal Note

--- a/eventsui/eventsmgmtui/inc/evtmgmtuimodel.h	Sun Mar 14 13:09:03 2010 +0000
+++ b/eventsui/eventsmgmtui/inc/evtmgmtuimodel.h	Sun Mar 28 16:36:00 2010 +0100
@@ -84,7 +84,7 @@
      * It will return Events array object reference.
      * @ret Events array object reference
      */
-    RPointerArray<CEvtBasicEventInfo>& CEvtMgmtUiModel::EventsArray();
+    RPointerArray<CEvtBasicEventInfo>& EventsArray();
     
 	/**
      * returns eventinfo object.

--- a/landmarksui/engine/inc/CLmkEncoder.h	Sun Mar 14 13:09:03 2010 +0000
+++ b/landmarksui/engine/inc/CLmkEncoder.h	Sun Mar 28 16:36:00 2010 +0100
@@ -88,7 +88,7 @@
         * @param aFile where parsed data is stored
         * @param aLandmarks
         */
-        IMPORT_C void CLmkEncoder::StartEncodingL(const TDesC& aFileName,
+        IMPORT_C void StartEncodingL(const TDesC& aFileName,
                     	const RPointerArray<CLmkLandmark>& aLandmarks );
 
         /**

--- a/landmarksui/engine/inc/CLmkLandmark.h	Sun Mar 14 13:09:03 2010 +0000
+++ b/landmarksui/engine/inc/CLmkLandmark.h	Sun Mar 28 16:36:00 2010 +0100
@@ -74,7 +74,7 @@
         const RPointerArray<CPosLandmarkCategory>& aCategories
        );
 
-       IMPORT_C static CLmkLandmark* CLmkLandmark::NewL(
+       IMPORT_C static CLmkLandmark* NewL(
        const CLmkLandmark&  aLandmark);
 
 

--- a/landmarksui/engine/inc/CLmkLmItemListProvider.h	Sun Mar 14 13:09:03 2010 +0000
+++ b/landmarksui/engine/inc/CLmkLmItemListProvider.h	Sun Mar 28 16:36:00 2010 +0100
@@ -85,7 +85,7 @@
                         RArray<TPosLmItemId>& aSelectedItems,
                         const CArrayFix<TInt>& aSelectedIndexes ) const;
 
-		IMPORT_C void CLmkLmItemListProvider::GetAllItemIdsL(
+		IMPORT_C void GetAllItemIdsL(
 		    RArray<TPosLmItemId>& aSelectedItems ) const;
 
         /**

--- a/landmarksui/uicontrols/inc/CLmkAppLmItemSelectorImpl.h	Sun Mar 14 13:09:03 2010 +0000
+++ b/landmarksui/uicontrols/inc/CLmkAppLmItemSelectorImpl.h	Sun Mar 28 16:36:00 2010 +0100
@@ -67,11 +67,9 @@
         */
         void ChangeIconCmdL();
         // Added for Bug Fix
-        void CLmkAppLmItemSelectorImpl::DiskSpaceBelowCriticalLevelL(
-									    TInt aBytesToWrite, TChar aDrive);
+        void DiskSpaceBelowCriticalLevelL(TInt aBytesToWrite, TChar aDrive);
 
-		TInt CLmkAppLmItemSelectorImpl::CalculateLandmarkDisksize(
-    									const CPosLandmark& aLandmark);
+		TInt CalculateLandmarkDisksize(const CPosLandmark& aLandmark);
 
     public: // From CLmkAppSelectorImplBase
         MLmkListMemento* MementoL();

--- a/landmarksui/uicontrols/inc/CLmkEditorImpl.h	Sun Mar 14 13:09:03 2010 +0000
+++ b/landmarksui/uicontrols/inc/CLmkEditorImpl.h	Sun Mar 28 16:36:00 2010 +0100
@@ -302,7 +302,7 @@
 
     TBool IsFieldEmptyL(const TUint16 aFieldType);
 
-    TBool CLmkEditorImpl::IsInvalidUriL();
+    TBool IsInvalidUriL();
 
     void LaunchLmkEditorL();
 

--- a/landmarksui/uicontrols/inc/CLmkSaveLandmarkUtils.h	Sun Mar 14 13:09:03 2010 +0000
+++ b/landmarksui/uicontrols/inc/CLmkSaveLandmarkUtils.h	Sun Mar 28 16:36:00 2010 +0100
@@ -87,8 +87,7 @@
         * @param aNewFoundCategory
         * @param aNewcategories
         */
-        TInt CLmkSaveLandmarkUtils::CheckForNewCategories2L(
-                                     TDes& aNewFoundCategory,
+        TInt CheckForNewCategories2L(TDes& aNewFoundCategory,
                                      RArray<TCategoryName>& aNewcategories);
          /*
          * Display confirmation query
@@ -97,8 +96,8 @@
          /*
          * Display confirmation note
          */
-        void CLmkSaveLandmarkUtils::LmsSavedConfirmationNoteL(RArray<TUint> & aImportIndexes,
-                                           			  TInt aEditedItemIndex = 0);
+        void LmsSavedConfirmationNoteL(RArray<TUint> & aImportIndexes,
+                                       TInt aEditedItemIndex = 0);
 
     public://New Functions
         /**

--- a/locationlandmarksuirefapp/inc/LmUiRefAppView.h	Sun Mar 14 13:09:03 2010 +0000
+++ b/locationlandmarksuirefapp/inc/LmUiRefAppView.h	Sun Mar 28 16:36:00 2010 +0100
@@ -93,7 +93,7 @@
 		TBool IsLmDbEmptyL();
 
 		// Single category selector dialog
-		TInt CLmUiRefAppView::LaunchSingleCategoeyDialogL();
+		TInt LaunchSingleCategoeyDialogL();
 
     public: // From CAknView
         TUid Id() const;