--- a/mm_plat/audio_routing_api/inc/AudioOutput.h	Sun Mar 14 13:15:49 2010 +0000
+++ b/mm_plat/audio_routing_api/inc/AudioOutput.h	Sun Mar 28 16:40:21 2010 +0100
@@ -65,56 +65,56 @@
         * @param CMdaAudioRecorderUtility& - a reference to CMdaAudioRecorderUtility object
         * @return pointer to CAudioOutput object
         */		
-		IMPORT_C static CAudioOutput* CAudioOutput::NewL(CMdaAudioRecorderUtility& aUtility, TBool aRecordStream);
+		IMPORT_C static CAudioOutput* NewL(CMdaAudioRecorderUtility& aUtility, TBool aRecordStream);
 		/**
         * Factory function for creating audio output object.
         * @since 3.0
         * @param CMdaAudioOutputStream& - a reference to CMdaAudioOutputStream object
         * @return pointer to CAudioOutput object
         */		
-		IMPORT_C static CAudioOutput* CAudioOutput::NewL(CMdaAudioOutputStream& aUtility);
+		IMPORT_C static CAudioOutput* NewL(CMdaAudioOutputStream& aUtility);
 		/**
         * Factory function for creating audio output object.
         * @since 3.0
         * @param CMdaAudioToneUtility& - a reference to CMdaAudioToneUtility object
         * @return pointer to CAudioOutput object
         */		
-		IMPORT_C static CAudioOutput* CAudioOutput::NewL(CMdaAudioToneUtility& aUtility);
+		IMPORT_C static CAudioOutput* NewL(CMdaAudioToneUtility& aUtility);
 		/**
         * Factory function for creating audio output object.
         * @since 3.0
         * @param CMMFDevSound& - a reference to CMMFDevSound object
         * @return pointer to CAudioOutput object
         */		
-		IMPORT_C static CAudioOutput* CAudioOutput::NewL(CMMFDevSound& aDevSound);
+		IMPORT_C static CAudioOutput* NewL(CMMFDevSound& aDevSound);
 		/**
         * Factory function for creating audio output object.
         * @since 3.0
         * @param MCustomInterface& - a reference to MCustomInterface object
         * @return pointer to CAudioOutput object
         */		
-		IMPORT_C static CAudioOutput* CAudioOutput::NewL(MCustomInterface& aUtility);
+		IMPORT_C static CAudioOutput* NewL(MCustomInterface& aUtility);
 		/**
         * Factory function for creating audio output object.
         * @since 3.0
         * @param MCustomCommand& - a reference to MCustomCommand object
         * @return pointer to CAudioOutput object
         */		
-		IMPORT_C static CAudioOutput* CAudioOutput::NewL(MCustomCommand& aUtility);
+		IMPORT_C static CAudioOutput* NewL(MCustomCommand& aUtility);
 		/**
         * Factory function for creating audio output object.
         * @since 3.0
         * @param CMidiClientUtility& - a reference to CMidiClientUtility object
         * @return pointer to CAudioOutput object
         */		
-		IMPORT_C static CAudioOutput* CAudioOutput::NewL(CMidiClientUtility& aUtility);
+		IMPORT_C static CAudioOutput* NewL(CMidiClientUtility& aUtility);
 		/**
         * Factory function for creating audio output object.
         * @since 3.0
         * @param CDrmPlayerUtility& - a reference to CDrmPlayerUtility object
         * @return pointer to CAudioOutput object
         */		
-		IMPORT_C static CAudioOutput* /*CAudioOutput::*/NewL(CDrmPlayerUtility& aUtility);
+		IMPORT_C static CAudioOutput* NewL(CDrmPlayerUtility& aUtility);
 		
 		/**
         * Factory function for creating audio output object.
@@ -122,7 +122,7 @@
         * @param CVideoPlayerUtility& - a reference to CVideoPlayerUtility object
         * @return pointer to CAudioOutput object
         */		
-		IMPORT_C static CAudioOutput* /*CAudioOutput::*/NewL(CVideoPlayerUtility& aUtility);
+		IMPORT_C static CAudioOutput* NewL(CVideoPlayerUtility& aUtility);
 
 		/**
 		* ?member_description.

--- a/mmresourcemgmt/mmresctrl/inc/mmrcclientsession.h	Sun Mar 14 13:15:49 2010 +0000
+++ b/mmresourcemgmt/mmresctrl/inc/mmrcclientsession.h	Sun Mar 28 16:40:21 2010 +0100
@@ -33,7 +33,7 @@
 	{
 public:
 	RMMRCClientSession();
-	RMMRCClientSession::~RMMRCClientSession();
+	~RMMRCClientSession();
 
 	TInt StartServer();
 	TInt Open(MMultimediaResourceControlObserver& aCallback);