# HG changeset patch
# User Stefan Karlsson <stefan.karlsson@nokia.com>
# Date 1269861948 -3600
# Node ID 49b497aeb789f40efc12631a88f6495de57bdf36
# Parent  db95ac47977d50ddca1f7859a88cfc8f833cbf77# Parent  c7f00bb26c69df726b7163ffa747ae50558c8696
Merge.

diff -r c7f00bb26c69 -r 49b497aeb789 omads/omadsappui/AspSyncUtil/inc/AspDialogUtil.h
--- a/omads/omadsappui/AspSyncUtil/inc/AspDialogUtil.h	Sun Mar 14 13:08:39 2010 +0000
+++ b/omads/omadsappui/AspSyncUtil/inc/AspDialogUtil.h	Mon Mar 29 12:25:48 2010 +0100
@@ -371,7 +371,7 @@
         /**
         * C++ default constructor.
         */
-        CAspIndicatorHandler::CAspIndicatorHandler(MAknEditingStateIndicator* aIndicator);
+        CAspIndicatorHandler(MAknEditingStateIndicator* aIndicator);
 
 	public:
 
diff -r c7f00bb26c69 -r 49b497aeb789 omads/omadsappui/AspSyncUtil/inc/AspUtil.h
--- a/omads/omadsappui/AspSyncUtil/inc/AspUtil.h	Sun Mar 14 13:08:39 2010 +0000
+++ b/omads/omadsappui/AspSyncUtil/inc/AspUtil.h	Mon Mar 29 12:25:48 2010 +0100
@@ -323,7 +323,7 @@
 		* @param  None.
 		* @return None.
 		*/
-		static void CAspIdleWait::WaitL();
+		static void WaitL();
 		
     private:
         static TInt IdleCallback(TAny* aThisPtr);        
@@ -685,4 +685,4 @@
 #endif  // ASPUTIL_H
 
 
-// End of file
\ No newline at end of file
+// End of file
diff -r c7f00bb26c69 -r 49b497aeb789 omads/omadsextensions/adapters/sms/inc/SMSAdapterMsvApi.h
--- a/omads/omadsextensions/adapters/sms/inc/SMSAdapterMsvApi.h	Sun Mar 14 13:08:39 2010 +0000
+++ b/omads/omadsextensions/adapters/sms/inc/SMSAdapterMsvApi.h	Mon Mar 29 12:25:48 2010 +0100
@@ -111,7 +111,7 @@
         *
         * @return   KErrNone in success. KErrInUse if folder was not deleted because it was not empty.                             
         */         
-        TInt CSmsAdapterMsvApi::DeleteUserFolderL( TMsvId aUid );
+        TInt DeleteUserFolderL( TMsvId aUid );
 
         /**
         * Retriveve SMS message from the message store.
@@ -150,7 +150,7 @@
        /**
         * Empties user folders under My Folders from SMS messages
         */       
-        void CSmsAdapterMsvApi::CleanUserFoldersL(); 
+        void CleanUserFoldersL(); 
         
        /**
         * Empties folder from SMS messages and returns list of deleted messages
diff -r c7f00bb26c69 -r 49b497aeb789 omads/omadsextensions/dsutils/nsmldefaultagendahandler/inc/nsmldefaultagendahandlerplugin.h
--- a/omads/omadsextensions/dsutils/nsmldefaultagendahandler/inc/nsmldefaultagendahandlerplugin.h	Sun Mar 14 13:08:39 2010 +0000
+++ b/omads/omadsextensions/dsutils/nsmldefaultagendahandler/inc/nsmldefaultagendahandlerplugin.h	Mon Mar 29 12:25:48 2010 +0100
@@ -67,7 +67,7 @@
 	* C++ constructor - not exported;
 	* implicitly called from NewLC()	
 	*/
-	CNSmlDefaultAgendaHandlerPlugin::CNSmlDefaultAgendaHandlerPlugin();	
+	CNSmlDefaultAgendaHandlerPlugin();	
 	
 	void ConstructL();