diff -r 14754bf06654 -r cf1b3ddbe9a1 bearermanagement/mpm/inc/mpmserver.h --- a/bearermanagement/mpm/inc/mpmserver.h Wed Sep 15 12:38:40 2010 +0300 +++ b/bearermanagement/mpm/inc/mpmserver.h Wed Oct 13 14:59:48 2010 +0300 @@ -201,8 +201,6 @@ class CMPMWlanQueryDialog; class CMPMDialog; class CMPMConnPermQueryTimer; -class CMPMOfflineQueryTimer; -class CMPMConnSelectionDlgTimer; // CLASS DECLARATION /** @@ -915,10 +913,9 @@ /** * Stops cellular connections, except MMS - * @param aSilentOnly stop only silent cellular connections * @since 5.2 */ - void StopCellularConns( TBool aSilentOnly = EFalse ); + void StopCellularConns(); /** * Offline mode watcher updates the mode variable stored by MPM server. @@ -968,49 +965,7 @@ * @return ETrue if timer is running, EFalse otherwise. */ TBool IsConnPermQueryTimerOn(); - - /** - * Starts the offline query timer. - * During the timer, offline query can not be initiated. - * @since 5.2 - */ - void StartOfflineQueryTimer(); - /** - * Resets the offline query timer. - * @since 5.2 - */ - void ResetOfflineQueryTimer(); - - /** - * Returns true if the offline query timer is running. - * During the timer, offline query can not be initiated. - * @since 5.2 - * @return ETrue if timer is running, EFalse otherwise. - */ - TBool IsOfflineQueryTimerOn(); - - /** - * Starts the connection selection dialog timer. - * During the timer, connection selection dialog can not be initiated. - * @since 5.2 - */ - void StartConnSelectionDlgTimer(); - - /** - * Resets the connection selection dialog timer. - * @since 5.2 - */ - void ResetConnSelectionDlgTimer(); - - /** - * Returns true if the connection selection dialog timer is running. - * During the timer, connection selection dialog can not be initiated. - * @since 5.2 - * @return ETrue if timer is running, EFalse otherwise. - */ - TBool IsConnSelectionDlgTimerOn(); - private: /** @@ -1039,13 +994,6 @@ TBool aCheckForBestIap, TMPMBearerType aDestinationBearerType ); - /** - * Check if iap can be disconnected, and disconnect it - * @since 5.2 - * @param aIapId Iap id for checking - */ - void CheckIapForDisconnect( TInt aIapId ); - private: // Data // Pointer to the ConnMonEvents object @@ -1164,13 +1112,6 @@ // Connection permission query cancellation delay timer CMPMConnPermQueryTimer* iConnPermQueryTimer; - - // Offline query cancellation delay timer - CMPMOfflineQueryTimer* iOfflineQueryTimer; - - // Connection selection dialog cancellation delay timer - CMPMConnSelectionDlgTimer* iConnSelectionDlgTimer; - }; #include "mpmserver.inl"