# HG changeset patch
# User Stefan Karlsson <stefan.karlsson@nokia.com>
# Date 1269861952 -3600
# Node ID bb2f3dabcaa985d3ee06f5e8e09a0063776d6bc0
# Parent  76d6129f27f759c9c8752414a66a0200b2d1345b# Parent  7a8b39b569cb2c2c3cebe45fa71652ace29893dc
Merge.

diff -r 76d6129f27f7 -r bb2f3dabcaa9 idlehomescreen/exths/inc/plugincontainer/caiplugincontainercontrol.h
--- a/idlehomescreen/exths/inc/plugincontainer/caiplugincontainercontrol.h	Fri Mar 26 13:47:51 2010 +0900
+++ b/idlehomescreen/exths/inc/plugincontainer/caiplugincontainercontrol.h	Mon Mar 29 12:25:52 2010 +0100
@@ -152,7 +152,7 @@
         * From CCoeControl
         * @param TTypeUid aId
         */
-        TTypeUid::Ptr CAIPluginContainerControl::MopSupplyObject(TTypeUid aId);
+        TTypeUid::Ptr MopSupplyObject(TTypeUid aId);
 
     public: // from CExtrStandbyContainerIF
 
diff -r 76d6129f27f7 -r bb2f3dabcaa9 idlehomescreen/inc/xnappuiadapter.h
--- a/idlehomescreen/inc/xnappuiadapter.h	Fri Mar 26 13:47:51 2010 +0900
+++ b/idlehomescreen/inc/xnappuiadapter.h	Mon Mar 29 12:25:52 2010 +0100
@@ -136,7 +136,7 @@
      * @since S60 5.0
      * @return Xml Ui View 
      */
-    IMPORT_C CAknView& CXnAppUiAdapter::View() const;
+    IMPORT_C CAknView& View() const;
 	    
     /**
      * Handles changes when entering or exiting edit mode 
diff -r 76d6129f27f7 -r bb2f3dabcaa9 idlehomescreen/inc/xnresource.h
--- a/idlehomescreen/inc/xnresource.h	Fri Mar 26 13:47:51 2010 +0900
+++ b/idlehomescreen/inc/xnresource.h	Mon Mar 29 12:25:52 2010 +0100
@@ -375,7 +375,7 @@
         * @param aOffset a buffer position of iBuffer to write data.
         * @return RBufWriteStream& write stream.
         */
-        IMPORT_C RBufWriteStream& CXnResource::WriteStream( TUint aOffset = 0 );      
+        IMPORT_C RBufWriteStream& WriteStream( TUint aOffset = 0 );      
         
         /**
         * CXnResource::ReadStream(). Gets read stream on iBuffer.
@@ -383,7 +383,7 @@
         * @param aOffset a buffer position of iBuffer to read data. 
         * @return RBufReadStream& read stream
         */
-        IMPORT_C RBufReadStream& CXnResource::ReadStream(TUint aOffset = 0 );
+        IMPORT_C RBufReadStream& ReadStream(TUint aOffset = 0 );
 
         /**
         * CXnResource::SetOffset(). Sets internal data pointer of iBuffer.
diff -r 76d6129f27f7 -r bb2f3dabcaa9 idlehomescreen/nativeuicontroller/inc/ainavipaneanimator.h
--- a/idlehomescreen/nativeuicontroller/inc/ainavipaneanimator.h	Fri Mar 26 13:47:51 2010 +0900
+++ b/idlehomescreen/nativeuicontroller/inc/ainavipaneanimator.h	Mon Mar 29 12:25:52 2010 +0100
@@ -77,7 +77,7 @@
     /**
      * Called by CPeriodic when timer expires.
      */
-    static TInt CAiNaviPaneAnimator::AnimCallback( TAny* aPtr );     
+    static TInt AnimCallback( TAny* aPtr );     
 
     /**
      * Draws the text to navi pane.
diff -r 76d6129f27f7 -r bb2f3dabcaa9 menufw/hierarchynavigator/hnmetadatamodel/inc/hnmdservice.h
--- a/menufw/hierarchynavigator/hnmetadatamodel/inc/hnmdservice.h	Fri Mar 26 13:47:51 2010 +0900
+++ b/menufw/hierarchynavigator/hnmetadatamodel/inc/hnmdservice.h	Mon Mar 29 12:25:52 2010 +0100
@@ -119,7 +119,7 @@
      * @param aElement Xml element.
      * @return A structure of the key objects.
      */
-    void CHnMdService::SetConstructorL( TXmlEngElement aElement );
+    void SetConstructorL( TXmlEngElement aElement );
     
     /**
      * Evaluates constructor.
diff -r 76d6129f27f7 -r bb2f3dabcaa9 menufw/hierarchynavigator/hnmetadatamodel/inc/hnmdvalueimage.h
--- a/menufw/hierarchynavigator/hnmetadatamodel/inc/hnmdvalueimage.h	Fri Mar 26 13:47:51 2010 +0900
+++ b/menufw/hierarchynavigator/hnmetadatamodel/inc/hnmdvalueimage.h	Mon Mar 29 12:25:52 2010 +0100
@@ -244,7 +244,7 @@
      * @param aKeyMask A mask key to be created.
      * @param aMaskIdBuf A mask id.
      */
-    void CHnMdValueImage::CreateKeysLC( RBuf8& aKeyBitmap, RBuf8& aBitmapIdBuf, 
+    void CreateKeysLC( RBuf8& aKeyBitmap, RBuf8& aBitmapIdBuf, 
     		RBuf8& aKeyMask, RBuf8& aMaskIdBuf );