--- a/policymanagement/policyengine/policyengineserver/src/TrustedSession.cpp	Fri Apr 16 15:52:47 2010 +0300
+++ b/policymanagement/policyengine/policyengineserver/src/TrustedSession.cpp	Mon May 03 13:19:46 2010 +0300
@@ -28,7 +28,7 @@
 #include "ErrorCodes.h"
 
 #include <x509cert.h>
-#include <imcvcodc.h>
+#include <tconvbase64.h>
 
 
 
@@ -244,7 +244,7 @@
 			TCertInfo certInfo;
 			TPckg<TCertInfo> pck( certInfo );
 	
-			TImCodecB64 base64;
+			TBase64 base64;
 			User::LeaveIfError( base64.Decode( value, pck ) );	
 				
 			//create suject info for it
@@ -472,7 +472,7 @@
 	
 	//serialize TCertInfo and decode it to base64 format
 	TPckg<TCertInfo> pck( iSessionCertInfo);
-	TImCodecB64 base64;
+	TBase64 base64;
 	HBufC8 * base64coded = HBufC8::NewLC( pck.Length() * 3);
 	TPtr8 base64Ptr = base64coded->Des();
 	User::LeaveIfError( base64.Encode( pck, base64Ptr));	
@@ -999,7 +999,7 @@
 				TCertInfo certInfo;
 				TPckg<TCertInfo> pck( certInfo);
 	
-				TImCodecB64 base64;
+				TBase64 base64;
 				User::LeaveIfError( base64.Decode( binaryCert, pck));	
 				
 				//create suject info for it
@@ -1457,7 +1457,7 @@
 			}
 #endif	//#ifdef __DEBUG
 			//convert base64 coding to binary format
-			TImCodecB64 base64;
+			TBase64 base64;
 			
 			HBufC8 * base64Cert = HBufC8::NewLC( certPtr.Length());
 			TPtr8 base64Ptr = base64Cert->Des();