# HG changeset patch
# User Stefan Karlsson <stefan.karlsson@nokia.com>
# Date 1269950458 -3600
# Node ID c93bcd9bf89c9ae203881ad869058bc1521b4bbd
# Parent  b02a5d2af40b3d769efb6b40fdd8c7c73f10257d# Parent  e771c3fd999217c8a3e3f9e43151b8dcce7eae69
Merge.

diff -r e771c3fd9992 -r c93bcd9bf89c omaprovisioning/provisioning/cpdestinationnwadapter/inc/cwpdestinationnwadapter.h
--- a/omaprovisioning/provisioning/cpdestinationnwadapter/inc/cwpdestinationnwadapter.h	Tue Mar 30 17:12:42 2010 +0900
+++ b/omaprovisioning/provisioning/cpdestinationnwadapter/inc/cwpdestinationnwadapter.h	Tue Mar 30 13:00:58 2010 +0100
@@ -56,7 +56,7 @@
      * @param aDes Descriptor to be converted.
      * @return Unsigned 32-bit integer.
      */
-    TUint32 CWPDestinationNwAdapter::Des8ToUint32L( const TDesC8& aDes );
+    TUint32 Des8ToUint32L( const TDesC8& aDes );
 
 // from base class CWPAdapter
 
diff -r e771c3fd9992 -r c93bcd9bf89c policymanagement/policyengine/policyengineserver/inc/CommsDatEnforcement.h
--- a/policymanagement/policyengine/policyengineserver/inc/CommsDatEnforcement.h	Tue Mar 30 17:12:42 2010 +0900
+++ b/policymanagement/policyengine/policyengineserver/inc/CommsDatEnforcement.h	Tue Mar 30 13:00:58 2010 +0100
@@ -58,7 +58,7 @@
 		TInt CheckTableL( const TDesC& aTableName );
 		
 		
-		TUint32 CCommsDatEnforcement::GetRecordIdL( const TDesC& aTableName );
+		TUint32 GetRecordIdL( const TDesC& aTableName );
 		
 	private:
 		//active state 
@@ -87,4 +87,4 @@
 };
 
 
-#endif
\ No newline at end of file
+#endif
diff -r e771c3fd9992 -r c93bcd9bf89c syncmlfw/dm/settings/inc/nsmldmsettings.h
--- a/syncmlfw/dm/settings/inc/nsmldmsettings.h	Tue Mar 30 17:12:42 2010 +0900
+++ b/syncmlfw/dm/settings/inc/nsmldmsettings.h	Tue Mar 30 13:00:58 2010 +0100
@@ -442,7 +442,7 @@
 		* @param TNSmlDMProfileData aProfileItem - Enumeration of the field
 		* @return HBufC* - value of nonce, that is left in cleanup stack
 		*/
-		IMPORT_C HBufC* CNSmlDMProfile::NonceLC( TNSmlDMProfileData aProfileItem);
+		IMPORT_C HBufC* NonceLC( TNSmlDMProfileData aProfileItem);
 
 		/**
 		* Sets new value for descriptor
diff -r e771c3fd9992 -r c93bcd9bf89c syncmlfw/dm/treemodule/inc/nsmldmddf.h
--- a/syncmlfw/dm/treemodule/inc/nsmldmddf.h	Tue Mar 30 17:12:42 2010 +0900
+++ b/syncmlfw/dm/treemodule/inc/nsmldmddf.h	Tue Mar 30 13:00:58 2010 +0100
@@ -241,7 +241,7 @@
 	* @return					KErrNotFound if not found, otherwise KErrNone
 	*/
 	
-    TInt CNSmlDmDDF::GetCaseSenseL(const TDesC8& aURI,CBufBase& aObject);
+    TInt GetCaseSenseL(const TDesC8& aURI,CBufBase& aObject);
    		
 
 	/**
@@ -565,4 +565,4 @@
 	CBufBase *iResults;
 	};
 
-#endif // __NSMLDMDDF_H
\ No newline at end of file
+#endif // __NSMLDMDDF_H