--- a/supl/locationsuplfw/settingsapi/src/epos_csuplsettings.cpp Tue Aug 31 15:37:04 2010 +0300
+++ b/supl/locationsuplfw/settingsapi/src/epos_csuplsettings.cpp Wed Sep 01 12:24:21 2010 +0100
@@ -237,18 +237,33 @@
//
//This method is used to retrieve SUPL usage from settings storage.
//--------------------------------------------------------------------------------------
-EXPORT_C TInt CSuplSettings::GetSuplUsage(TSuplSettingsUsage& /* aUsage */ ) const
+EXPORT_C TInt CSuplSettings::GetSuplUsage(TSuplSettingsUsage& aUsage) const
{
- return KErrNotSupported;
+ TInt usage, ret;
+ ret = iSettingsEngine->GetSuplUsage(usage);
+
+ if (ret == KErrNone)
+ {
+ aUsage = (TSuplSettingsUsage)usage;
+ return KErrNone;
+ }
+ else
+ return ret;
}
//-------------------------------------------------------------------------------------
//CSuplSettings::SetSuplUsage()
//
//This method is used to change SUPL usage.
//--------------------------------------------------------------------------------------
-EXPORT_C TInt CSuplSettings::SetSuplUsage(const TSuplSettingsUsage /* aUsage */ )
+EXPORT_C TInt CSuplSettings::SetSuplUsage(const TSuplSettingsUsage aUsage)
{
- return KErrNotSupported;
+ TInt usage = aUsage;
+
+ if (usage < CSuplSettings::ESuplUsageAlwaysAsk ||
+ usage > CSuplSettings::ESuplUsageDisabled)
+ return KErrArgument;
+
+ return iSettingsEngine->SetSuplUsage(aUsage);
}
//-------------------------------------------------------------------------------------
//CSuplSettings::AddNewServer()
@@ -590,26 +605,4 @@
{
return iSettingsEngine->GetDefaultIAPName(aIapName);
}
-
-
-//---------------------------------------------------------------------
-// CSuplSettings::SetSuplTriggeredServiceStatus()
-//
-// Changes status of SUPL triggering service.
-//---------------------------------------------------------------------
-EXPORT_C TInt CSuplSettings::SetSuplTriggeredServiceStatus( const TSuplTriggerStatus& aSuplTriggerStatus )
- {
- return iSettingsEngine->SetSuplTriggeredServiceStatus(aSuplTriggerStatus);
- }
-
-//---------------------------------------------------------------------
-// CSuplSettings::GetSuplTriggeredServiceStatus()
-//
-// Gets status of SUPL triggering service.SUPL Triggering service can be either ESuplTriggerOn or ESuplTriggerOff
-//---------------------------------------------------------------------
-EXPORT_C TInt CSuplSettings::GetSuplTriggeredServiceStatus( TSuplTriggerStatus& aSuplTriggerStatus )
- {
- return iSettingsEngine->GetSuplTriggeredServiceStatus(aSuplTriggerStatus);
- }
-
// End of File