--- a/inc/mussettings.h	Sun Mar 14 13:09:13 2010 +0000
+++ b/inc/mussettings.h	Sun Mar 28 16:36:10 2010 +0100
@@ -49,15 +49,14 @@
      *
      * @return
      */
-    static MusSettingsKeys::TOperatorVariant
-                MultimediaSharingSettings::OperatorVariantSettingL();
+    static MusSettingsKeys::TOperatorVariant OperatorVariantSettingL();
 
     /**
      * Sets 
      *
      * @param
      */
-    static void MultimediaSharingSettings::SetOperatorVariantSettingL(
+    static void SetOperatorVariantSettingL(
                      MusSettingsKeys::TOperatorVariant aVariantSetting );
 
     /**
@@ -235,9 +234,7 @@
      * @param
      * @param
      */
-    static void MultimediaSharingSettings::SetPropertyValueL( 
-                                            TUint32 aKey,
-                                            const TDesC& aValue );
+    static void SetPropertyValueL( TUint32 aKey, const TDesC& aValue );
                                             
      /**
      * For internal usage only. Use direct getters/setters for each setting. 
@@ -253,7 +250,7 @@
      * Means AVC will be disabled when encoding device cenrep configuration 
      * set to 0x0fffffff.
      */
-    static TBool MultimediaSharingSettings::IsAvcDisabled();
+    static TBool IsAvcDisabled();
     
 
      /**

--- a/mmsharing/mmshavailability/inc/musavacapabilitycontext.h	Sun Mar 14 13:09:13 2010 +0000
+++ b/mmsharing/mmshavailability/inc/musavacapabilitycontext.h	Sun Mar 28 16:36:10 2010 +0100
@@ -186,8 +186,7 @@
      * @param aTrx request
      * @return originator's URI
      */
-    static const CUri8& MusAvaCapabilityContext::OriginatorL( 
-                                const CSIPServerTransaction& aTrx );
+    static const CUri8& OriginatorL( const CSIPServerTransaction& aTrx );
 
     /**
      * Finds header from user headers based on header's name
@@ -226,7 +225,7 @@
      * @param aMessage SIP message header.     
      * @return array which has all P-Asserted-Identity header.
      */
-    static CDesCArrayFlat* MusAvaCapabilityContext::PAssertedIdentityHeaderL(
+    static CDesCArrayFlat* PAssertedIdentityHeaderL(
                                     const CSIPMessageElements& aMessage );
     //MUS_UNITTEST ( UT_ )