diff -r 02ba3f1733c6 -r 2b4ea9893b66 supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplconnrequestor.h --- a/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplconnrequestor.h Thu Aug 19 10:20:18 2010 +0300 +++ b/supl/locationomasuplprotocolhandler/protocolhandlerver2/inc/epos_comasuplconnrequestor.h Tue Aug 31 15:37:04 2010 +0300 @@ -40,9 +40,7 @@ * @since S60 v3.1 */ -class COMASuplConnRequestor : public CActive, - public MOMASuplUICompletionObserver, - public MOMASuplDialogTimeOutNotifier +class COMASuplConnRequestor : public CActive { enum TConnState @@ -172,7 +170,6 @@ void GetUsedServerAddress(TDes& aHSLPAddressUsed); - void SettingsUICompletedL(TInt aError); void SettingsUsageUICompletedL(TInt /*aError*/) {} void SettingsTimeOutUICompletedL(TInt /*aError*/) {} TBool ConvertIAPNameToIdL(const TDesC& aIAPName, TUint32& aIAPId); @@ -220,7 +217,7 @@ * @param None * @return None */ - virtual void DialogTimerExpiredL(); + //virtual void DialogTimerExpiredL(); protected : // Functions from CActive /** * From CActive @@ -293,15 +290,7 @@ TInt64 iCurrentSLPId; - COMASuplDialogTimer* iDialogTimer; - - TBool iIapDialogShown; - - TBool iIapDlgTimerExpired; - - TBool iIsTimeoutDialogTimerStarted; - - TBool iTriggerSession; + TBool iTriggerSession; };