--- a/bearermanagement/mpm/inc/mpmconnmonevents.h	Tue Feb 02 00:24:11 2010 +0200
+++ b/bearermanagement/mpm/inc/mpmconnmonevents.h	Fri Apr 16 15:21:37 2010 +0300
@@ -32,13 +32,11 @@
 #include <commsdat.h>
 #include <commsdat_partner.h>
 #endif
-#include <NIFVAR.H>
+#include <nifvar.h>
 #include "mpmserver.h"
 
 // FORWARD DECLARATIONS
 class CMPMConnMonReqs;
-class CWlanAvailability;
-class MWlanAvailability;
 
 // CONSTANTS
 
@@ -298,31 +296,10 @@
         /**
          * Creates preferred carrier available notification when needed.
          * @since 5.1
-         */
-        void IapAvailabilityChange();
-
-        /**
-         * Asks WLAN bearer availability info from Connection monitor.
-         * @since 5.2
-         * @param aObserver pointer to the caller
+         * @param aCaller Identifies the calling context
          */
-        void CheckWlanAvailabilityL( MWlanAvailability* aObserver );
-        
-        /**
-         * Cancels WLAN bearer availability check for an observer.
-         * @since 5.2
-         * @param aObserver pointer to the caller
-         */
-        void CancelCheckWlanWlanAvailability( MWlanAvailability* aObserver );
-    
-        /**
-         * Sets iWlanAvailability pointer to NULL because object has
-         * deleted itself.
-         * @since 5.2
-         */
-        void SetWlanAvailabilityPtrNull();
-
-        
+        void IapAvailabilityChange( const TPrefIAPNotifCaller aCaller );
+       
     public: // Functions from base classes
     
         /**
@@ -373,7 +350,6 @@
         void FilterAvailableIAPEvents( const TBool aVal ) { iFilterEvents = aVal; }
 #endif //_DEBUG
 
-       CWlanAvailability*               iWlanAvailability;
     };
 
 // -----------------------------------------------------------------------------