diff -r fce0ae2e4223 -r 10852b179f64 supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplsession.h --- a/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplsession.h Tue Sep 14 22:09:33 2010 +0300 +++ b/supl/locationomasuplprotocolhandler/protocolhandlerver1/inc/epos_comasuplsession.h Wed Sep 15 12:40:28 2010 +0300 @@ -95,15 +95,13 @@ class COMASuplSession : public CSuplSessionBase, public MOMASuplConnObserver, - public MOMASuplUICompletionObserver, public MCompleteSelfRequest, public MOMASuplMsgStateObserver, public MOMASuplObserver, public MOMASuplPrivacyObserver, public MOMASuplTimeOutNotifier, public MOMASuplEtelCompletionObserver, - public MOMASuplIapChangeNotifierObserver, - public MOMASuplDialogTimeOutNotifier + public MOMASuplIapChangeNotifierObserver { public: // Constructors and destructor @@ -209,27 +207,6 @@ */ void GetPositionComplete(TInt aError); - /** - * This callback method is used to notify the client about - * the completion of UI launch - * @param aError - Error during Launch - * @return None - */ - void SettingsUICompletedL(TInt aError); - - /** - * This callback method is used to notify the client about - * the completion of UI - * @return None - */ - void SettingsUsageUICompletedL(TInt aError); - - /** - * This callback method is used to notify the client about - * the completion of UI - * @return None - */ - void SettingsTimeOutUICompletedL(TInt aError); public: /** @@ -256,7 +233,7 @@ * @param aSessionIdSeed, seed value of session * @param aRequestID, Request Identification number. * @param aIsStaleCellId, indicates if this session is for a stale cell id conversion - * @param aLocationId , contains cell id parameters for which position is to be retrieved + * @param aLocationId , contains cell id parameters for which position is to be retrieved,ownership is transferred to this object * @param aPrompt indicates if the user is to be prompted when making location requests * @param aWlanOnly ,request to connect server using wlan connection only using OCC Api's * @return None @@ -929,13 +906,7 @@ */ virtual void TimerExpiredL(); - /** - * Dialog Timeout Notifier Method. - * @since Series 60 9.1 TB - * @param None - * @return None - */ - virtual void DialogTimerExpiredL(); + public: // Usage dialog void SetSuplUsageFlag(); void ReSetSuplUsageFlag(); @@ -1090,8 +1061,7 @@ //Timeout Timer COMASuplTimeoutTimer* iTimer; - - COMASuplDialogTimer* iDialogTimer; + //Roaming indicator TBool iRoaming;