diff -r a828660c511c -r d3d7683d16f5 wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/inc/wlmplatformdata.h --- a/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/inc/wlmplatformdata.h Tue Aug 31 17:02:06 2010 +0300 +++ b/wlan_bearer/wlanengine/wlan_symbian/wlanengine_symbian_3.1/inc/wlmplatformdata.h Wed Sep 01 12:41:05 2010 +0100 @@ -16,7 +16,7 @@ */ /* -* %version: 14 % +* %version: 12 % */ #ifndef WLMPLATFORMDATA_H @@ -26,7 +26,6 @@ #include "802dot11.h" #include "wlmsystemnotify.h" #include "wlmplatformsubscriber.h" -#include "wlaninternalpskeys.h" /** * Interface class to PubSub and CenRep. @@ -100,12 +99,6 @@ */ TInt PublishBgScanInterval( TUint32& aInterval ); - - /** - * Method for reading WLAN on/off state. - * @return WLAN on/off state - */ - TWlanOnOffState GetWlanOnOffState(); private: // Methods @@ -119,29 +112,6 @@ * Symbian 2nd phase constructor. */ void ConstructL(); - - /** - * Notifies WLAN on/off observer of the changes - */ - void NotifyWlanOnOffObserver(); - - /** - * Method for publishing WLAN on/off state. - * @param aWlanState WLAN state to be published. - */ - void PublishWlanOnOff( TPSWlanOnOff aWlanState ); - - private: // Definitions - - /** - * Last WLAN on/off state notified to the observer. - */ - enum TWlanNotifiedState - { - EWlanNotifiedNone, // Initial value, Observer not yet notified anything - EWlanNotifiedOff, // Observer notified that WLAN is set OFF - EWlanNotifiedOn // Observer notified that WLAN is set ON - }; private: // Data @@ -154,12 +124,6 @@ /** Subscriber for watching KCTSYEmergencyCallInfo via P&S. */ CWlmPlatformSubscriber* iEmergencyCall; - /** Subscriber for watching WLAN master switch via CenRep. */ - CWlmPlatformSubscriber* iWlanOnOff; - - /** Subscriber for watching WLAN force disable switch via CenRep. */ - CWlmPlatformSubscriber* iWlanForceDisable; - /** Handle to KPropertyWlanMacAddress property via P&S. */ RProperty iPsMacAddress; @@ -169,9 +133,6 @@ /** Handle to KPropertyWlanBgScanInterval property via P&S. */ RProperty iPsBgScanInterval; - /** Handle to KPropertyWlanOnOffState property via P&S. */ - RProperty iPsOnOffState; - /** Callback for notifications. */ MWlmSystemNotify& iCallback; @@ -192,9 +153,6 @@ /** Whether Emergency Call is active. */ TBool iIsEmergencyCall; - - /** Last WLAN on/off state notified to the observer. */ - TWlanNotifiedState iNotifiedWlanState; };