diff -r fce0ae2e4223 -r 10852b179f64 supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h --- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h Tue Sep 14 22:09:33 2010 +0300 +++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplconnrequestor.h Wed Sep 15 12:40:28 2010 +0300 @@ -41,9 +41,7 @@ * @since S60 v3.1 */ -class COMASuplConnRequestor : public CActive, - public MOMASuplUICompletionObserver, - public MOMASuplDialogTimeOutNotifier +class COMASuplConnRequestor : public CActive { enum TConnState @@ -185,9 +183,7 @@ void GetUsedServerAddress(TDes& aHSLPAddressUsed); - void SettingsUICompletedL(TInt aError); - void SettingsUsageUICompletedL(TInt /*aError*/) {} - void SettingsTimeOutUICompletedL(TInt /*aError*/) {} + TBool ConvertIAPNameToIdL(const TDesC& aIAPName, TUint32& aIAPId); void UpdateNetInfo(const TTime& aLastTimeUsed,TInt& aMcc,TInt& aMnc, TInt& aCid,TInt& aLac,TInt& aType,TInt& aErrorCode); @@ -221,13 +217,7 @@ void SaveAccessPoint(const TDesC& aIapName); - /** - * Dialog Timeout Notifier Method. - * @since Series 60 9.1 TB - * @param None - * @return None - */ - virtual void DialogTimerExpiredL(); + protected : // Functions from CActive /** * From CActive @@ -301,15 +291,6 @@ TBool iIsSettingInitilized; TInt64 iCurrentSLPId; - - COMASuplDialogTimer* iDialogTimer; - - TBool iIapDialogShown; - - TBool iIapDlgTimerExpired; - - TBool iIsTimeoutDialogTimerStarted; - TBool iPrompt; TBool iWlanOnly;