--- a/serviceproviders/sapi_calendar/calendarservice/inc/entryattributes.h	Sun Mar 14 13:12:13 2010 +0000
+++ b/serviceproviders/sapi_calendar/calendarservice/inc/entryattributes.h	Sun Mar 28 16:38:04 2010 +0100
@@ -384,7 +384,7 @@
 	     * Two-phased constructor.
 	     * @return An instance of CEntryAttributes
 	    */
-		IMPORT_C static CEntryAttributes* CEntryAttributes::NewL();
+		IMPORT_C static CEntryAttributes* NewL();
 		/** 
 	     * Destructor.
 	    */
@@ -816,4 +816,4 @@
 		TInt32 iSetAttributes;
 	};
 	
-#endif __CALENDARENTRY_H
\ No newline at end of file
+#endif __CALENDARENTRY_H

--- a/serviceproviders/sapi_calendar/inc/calendarinterface.h	Sun Mar 14 13:12:13 2010 +0000
+++ b/serviceproviders/sapi_calendar/inc/calendarinterface.h	Sun Mar 28 16:38:04 2010 +0100
@@ -479,12 +479,12 @@
 		 *
 	     * @return void
 	    */
-		void CCalendarInterface::GetDesCFieldFromMapL( const CLiwGenericParamList& aInParamList, 
-														const TDesC8& aCmdName, 
-														const TDesC8& aMapName, 
-														const TDesC8& aFieldName, 
-														TBool aPosBased, 
-														HBufC*& aOutputField );
+		void GetDesCFieldFromMapL( const CLiwGenericParamList& aInParamList, 
+									const TDesC8& aCmdName, 
+									const TDesC8& aMapName, 
+									const TDesC8& aFieldName, 
+									TBool aPosBased, 
+									HBufC*& aOutputField );
 
 		/**
 	     * Extracts 8-bit Descriptor Field from Map in input param list
@@ -497,12 +497,12 @@
 		 *
 	     * @return void
 	    */
-		void CCalendarInterface::GetDesC8FieldFromMapL( const CLiwGenericParamList& aInParamList, 
-														const TDesC8& aCmdName, 
-														const TDesC8& aMapName, 
-														const TDesC8& aFieldName, 
-														TBool aPosBased, 
-														HBufC8*& aOutputField );
+		void GetDesC8FieldFromMapL( const CLiwGenericParamList& aInParamList, 
+									const TDesC8& aCmdName, 
+									const TDesC8& aMapName, 
+									const TDesC8& aFieldName, 
+									TBool aPosBased, 
+									HBufC8*& aOutputField );
 
 		/**
 	     * Extracts Entry attributes for Add/Update request
@@ -622,7 +622,7 @@
 		 *
 	     * @return True if given calendar is in use
 	    */
-		TBool CCalendarInterface::CheckCalendarInUse( const TDesC& aCalendarName );
+		TBool CheckCalendarInUse( const TDesC& aCalendarName );
 		
 	private:
 
@@ -658,4 +658,4 @@
 	};
 
 
-#endif __CALENDARINTERFACE_H
\ No newline at end of file
+#endif __CALENDARINTERFACE_H

--- a/serviceproviders/sapi_messaging/inc/messaginginterface.h	Sun Mar 14 13:12:13 2010 +0000
+++ b/serviceproviders/sapi_messaging/inc/messaginginterface.h	Sun Mar 28 16:38:04 2010 +0100
@@ -71,12 +71,12 @@
 		 *
 		 * @return TBool
 		 */
-		TBool CMessagingInterface::CheckInputTypeL( const TLiwVariant* aSource, 
-                                            TBool aLeaveFlag, 
-                                            LIW::TVariantTypeId aExpectedtype, 
-                                            const TDesC8& aCmdName, 
-											const TDesC8& aParameter,
-											const TDesC& aMessage );
+		TBool CheckInputTypeL( const TLiwVariant* aSource, 
+                               TBool aLeaveFlag, 
+                               LIW::TVariantTypeId aExpectedtype, 
+                               const TDesC8& aCmdName, 
+							   const TDesC8& aParameter,
+							   const TDesC& aMessage );
 	
 		
 	    /**
@@ -685,4 +685,4 @@
  		TBool CheckDesSize( const TDesC &aDes );
  	};	
 
-#endif __MESSAGINGINTERFACE_H
\ No newline at end of file
+#endif __MESSAGINGINTERFACE_H

--- a/serviceproviders/sapi_messaging/messagingservice/inc/messageheader.h	Sun Mar 14 13:12:13 2010 +0000
+++ b/serviceproviders/sapi_messaging/messagingservice/inc/messageheader.h	Sun Mar 28 16:38:04 2010 +0100
@@ -641,7 +641,7 @@
 	     * Two-phased constructor.
 	     * @return CRecipientList*
 	    */
-		IMPORT_C static CRecipientList* CRecipientList::NewL();
+		IMPORT_C static CRecipientList* NewL();
 
 	    /**
 	     * Destructor.
@@ -1011,4 +1011,4 @@
 	
 
 
-#endif __MESSAGEHEADER_H
\ No newline at end of file
+#endif __MESSAGEHEADER_H