--- a/omaprovisioning/provisioning/WAPAdapter/Inc/WPWAPItemFactory.h	Fri Apr 16 15:52:47 2010 +0300
+++ b/omaprovisioning/provisioning/WAPAdapter/Inc/WPWAPItemFactory.h	Mon May 03 13:19:46 2010 +0300
@@ -26,11 +26,12 @@
 class MWPWAPItemBase;
 class CWPCharacteristic;
 class CCommsDatabase;
-class CApDataHandler;
+class RCmConnectionMethodExt;
+class RCmDestinationExt;
 class CBookmarkDb;
 class RFavouritesDb;
 // CLASS DECLARATION
-
+class RCmManagerExt;
 /**
  * WPWAPItemFactory is a factory for all WAP items.
  *
@@ -53,7 +54,7 @@
             const TDesC& aDefaultName, 
             CWPCharacteristic& aCharacteristic, 
             CCommsDatabase*& aCommsDb, 
-            CApDataHandler*& aAPHandler );
+            RCmManagerExt*& aCmManager );
 
 
         /**
@@ -75,7 +76,7 @@
             const TDesC& aDefaultBookmarkName,
             CWPCharacteristic& aCharacteristic, 
             CCommsDatabase*& aCommsDb, 
-            CApDataHandler*& aAPHandler,
+            RCmManagerExt*& aCmManager,
             RFavouritesDb aBookmarkDb );
             
         /**