--- a/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsuiengine.h Tue Sep 14 22:09:33 2010 +0300
+++ b/locationsystemui/locationsysui/locsuplsettingsui/inc/locsuplsettingsuiengine.h Wed Sep 15 12:40:28 2010 +0300
@@ -50,8 +50,7 @@
* It further observers the SUPL Settings UI for any changes to the Settings
* values.
*/
-class CLocSUPLSettingsUiEngine : public CActive,
- public MLocSUPLSettingsAdapterObserver
+class CLocSUPLSettingsUiEngine : public MLocSUPLSettingsAdapterObserver
{
public:
/**
@@ -84,18 +83,7 @@
*/
virtual ~CLocSUPLSettingsUiEngine();
- /**
- * Launches the confirmation query to select IAP
- *
- */
- void SelectConnectionL();
- /**
- * Launches the Access Point Configurator dialog
- *
- */
- void LaunchApConfiguratorL( TInt64 aSlpId,
- MSuplServerEditorObserver* aEditorObserver );
/**
* Opens the exisitng server with its attributes
@@ -109,29 +97,12 @@
*/
TInt SlpCount();
- /**
- * Launches the SUPL Usage configurator
- */
- void LaunchSuplUsageConfiguratorL();
/**
* Closes the running Settings UI prematurely.
*/
void Close();
- /**
- * Obtains the SUPL Settings usage.
- *
- * @return TPtr16 SUPL settings usage.
- */
- TPtr16 GetSuplUsageL();
-
- /**
- * Obtains the SUPL usage
- *
- * @return The SUPL Usage value
- */
- TInt GetSuplUsage();
/**
* Creates a new server entry in Supl Settings.
@@ -316,22 +287,16 @@
*/
void SetTempAPValue( TUint32 aAccessPoint);
+ /**
+ * Generates IMSI address
+ */
+ void GenerateHslpAddressFromImsi(TDes& aIMSIAddress );
public:
/**
* Inherited from MLocSUPLSettingsAdapterObserver
*/
void HandleSuplSettingsChangeL( TLocSUPLSettingsEvent aEvent );
- protected:
- /**
- * Inherited from CActive
- */
- void RunL();
-
- /**
- * Inherited from CActive
- */
- void DoCancel();
private:
/**
@@ -360,12 +325,6 @@
*/
void DisplayErrorL( TInt aError );
- /**
- * Displays an Info note
- *
- * @param None
- */
- TInt ShowNoteL();
/**
* Returns value of last highlighted AP
@@ -384,12 +343,6 @@
*/
CLocSUPLSettingsAdapter* iSUPLSettingsAdapter;
- /**
- * Flag to denote whether any dialog is currently active
- * Used in the Cancel method. If there are any requests
- * outstanding then they have to be cancelled
- */
- TBool iDialogActive;
/**
* Temporary Buffer for returning values to the Accessor
@@ -410,10 +363,6 @@
*/
HBufC* iSettingsBuffer;
- /**
- * Pointer to the Settings Buffer
- */
- TPtr iSettingsBufferPtr;
/**
* Standard Text resolver for converting Error codes to
@@ -432,22 +381,12 @@
*/
TInt iLaunchParams;
- /**
- * Akn Global confirmation query
- * Owns
- */
- CAknGlobalConfirmationQuery* iConfirmQuery;
/**
* Flag to denote whether access point selection requested or not
*/
TBool iRequestIapSelect;
- /**
- * SUPL Servers SLP ID to get and set the server attributes.
- * Owns.
- */
- TInt64 iCurrentSlpId;
/**
* Supl Server Editor
@@ -455,11 +394,6 @@
*/
CLocSUPLServerEditor* iEditorDlg;
- /**
- * Editor Observer
- * Owns
- */
- MSuplServerEditorObserver* iEditorObserver;
/*
* Current highlighted AP