diff -r 02ba3f1733c6 -r 2b4ea9893b66 supl/locationsuplfw/gateway/inc/epos_csuplsessionrequest.h --- a/supl/locationsuplfw/gateway/inc/epos_csuplsessionrequest.h Thu Aug 19 10:20:18 2010 +0300 +++ b/supl/locationsuplfw/gateway/inc/epos_csuplsessionrequest.h Tue Aug 31 15:37:04 2010 +0300 @@ -28,14 +28,13 @@ #include #include #include "epos_suplgeocellinfo.h" - // CONSTANT DECLARATIONS // FORWARD DECLARATIONS class MSuplSessionObserver; class MNetInitiatedObserver; +class CSuplSessionBase; class CSuplSessionManager; -class CSuplSessionBase; // CLASS DECLARATION /** @@ -102,12 +101,11 @@ void CancelTriggerringRequest(); void ProtocolHUnloaded(); - void MakeLocationConversionRequestL( CSuplSessionBase* aSuplSessn,TGeoCellInfo& aCellInfo ); + + void CancelLocationConversionRequest(); - void CancelLocationConversionRequest(); void ReIssueRequestL(); - protected: // From CActive void RunL(); @@ -138,11 +136,11 @@ ESuplStartTriggerRequest, ESuplStopTriggerRequest, ESuplTriggerFiredNotifyRequest, + ESuplLocationConversionRequest, + ESuplCancelLocationConversionRequest, ESuplWaitingToRetrySession, - ESuplRetryingSession, - ESuplLocationConversionRequest, - ESuplCancelLocationConversionRequest - }; + ESuplRetryingSession + }; TSuplRequestStage iRequestPhase; HBufC8* iPositionBuffer;