--- a/omaprovisioning/provisioning/accesspointadapter/Inc/CWPAPNapdef.h	Thu May 27 13:43:36 2010 +0300
+++ b/omaprovisioning/provisioning/accesspointadapter/Inc/CWPAPNapdef.h	Fri Jun 11 14:27:59 2010 +0300
@@ -39,8 +39,9 @@
 class CWPParameter;
 class CCommsDatabase;
 class EAPSettings;
-class CertificateEntry;
+class EapCertificateEntry;
 class RCmManagerExt;
+class TEapExpandedType;
 
 
 // CLASS DECLARATION
@@ -55,7 +56,7 @@
         TBuf8<KExpandedEapIdLength> iEapTypeString;
         TBuf8<KExpandedEapIdLength> iEncapsulatingExpandedEapId;
         EAPSettings* iEAPSettings;
-        CertificateEntry* iCertificate;
+        EapCertificateEntry* iCertificate;
         };
 
 struct SECssID
@@ -227,7 +228,7 @@
         /**
         * ConvertEAPStringToIds
         */  
-        void ConvertEAPStringToIds(const TDesC& aEAPString, TDes8& aExpandedId, TUint& aId);
+        void ConvertEAPStringToIds(const TDesC& aEAPString, TDes8& aExpandedId, TEapExpandedType& aID);
   public: // new function
   
         /**