--- a/fep/aknfep/inc/AknFepFnKeyManager.h	Sun Mar 14 13:11:12 2010 +0000
+++ b/fep/aknfep/inc/AknFepFnKeyManager.h	Sun Mar 28 16:37:19 2010 +0100
@@ -84,10 +84,10 @@
     /* 
     * Handles the Fn key event to change the state appropriately.
     */
-    TKeyResponse CAknFepFnKeyManager::HandleFnKeyEventL( const TKeyEvent& aKeyEvent, 
-                                                TEventCode aEventCode,
-                                                TCoeInputCapabilities aInputCapabilities
-                                                );
+    TKeyResponse HandleFnKeyEventL( const TKeyEvent& aKeyEvent, 
+                           TEventCode aEventCode,
+                           TCoeInputCapabilities aInputCapabilities
+                           );
 
     void SetCase( TCase aCase );
     

--- a/fep/aknfep/inc/AknFepSharedDataInterface.h	Sun Mar 14 13:11:12 2010 +0000
+++ b/fep/aknfep/inc/AknFepSharedDataInterface.h	Sun Mar 28 16:37:19 2010 +0100
@@ -373,7 +373,7 @@
      * @return 1 for on or 0 for off
  	 * Since 5.0    
      */
-	TInt CAknFepSharedDataInterface::PredictiveTextAutoCompleteOn();
+	TInt PredictiveTextAutoCompleteOn();
 
     
     /**
@@ -381,7 +381,7 @@
      * is used to represent predictive text Auto Word Completion being on
  	 * Since 5.0    
      */    
-	void CAknFepSharedDataInterface::SetPredictiveTextAutoCompleteOn();
+	void SetPredictiveTextAutoCompleteOn();
 
 
     /**
@@ -389,7 +389,7 @@
      * is used to represent predictive text Auto Word Completion being off
  	 * Since 5.0    
      */    
-	void CAknFepSharedDataInterface::ResetPredictiveTextAutoCompleteOn();
+	void ResetPredictiveTextAutoCompleteOn();
 #ifndef RD_INTELLIGENT_TEXT_INPUT
 
     /**

--- a/fep/aknfep/peninputplugins/PeninputPluginKr/inc/PeninputPluginKr.h	Sun Mar 14 13:11:12 2010 +0000
+++ b/fep/aknfep/peninputplugins/PeninputPluginKr/inc/PeninputPluginKr.h	Sun Mar 28 16:37:19 2010 +0100
@@ -178,7 +178,7 @@
         CPtiEngine* /*aPtiEngine*/,
         RArray<TImePlguinImplDetail>& aSupportList) const; 
 
-    CPluginKrFepManagerBase* CPeninputPluginKr::GetCurrentUi();
+    CPluginKrFepManagerBase* GetCurrentUi();
 
     /**
      * Get VKB UI interface

--- a/textinput/peninputcommonlayout/inc/peninputlayoutwindow.h	Sun Mar 14 13:11:12 2010 +0000
+++ b/textinput/peninputcommonlayout/inc/peninputlayoutwindow.h	Sun Mar 28 16:37:19 2010 +0100
@@ -309,7 +309,7 @@
      */
     IMPORT_C virtual TBool ReconfigUnitSize(TInt aClientLayoutId);
        
-    IMPORT_C void CPeninputLayoutWindow::SetTextAlignmentL( TInt aAlignment );  
+    IMPORT_C void SetTextAlignmentL( TInt aAlignment );  
     
 protected:
 
@@ -448,7 +448,7 @@
      * @param aResId resource ID
      * @return None
      */    
-    void CPeninputLayoutWindow::ReadBackgroundInfoL( TInt aResId );
+    void ReadBackgroundInfoL( TInt aResId );
     
     /**
      * Read laf of shadow

--- a/textinput/peninputcommonlayout/inc/peninputlayoutwindowext.h	Sun Mar 14 13:11:12 2010 +0000
+++ b/textinput/peninputcommonlayout/inc/peninputlayoutwindowext.h	Sun Mar 28 16:37:19 2010 +0100
@@ -333,7 +333,7 @@
      */ 
     virtual TInt GetNumKeymappingResId() = 0;
     
-    IMPORT_C void CPeninputLayoutWindowExt::SetTextAlignmentL( TInt aAlignment );
+    IMPORT_C void SetTextAlignmentL( TInt aAlignment );
        
 protected: