201039_1
authorhgs
Wed, 27 Oct 2010 17:51:11 +0300
changeset 71 9f263f780e41
parent 70 ac5daea24fb0
child 72 0c32cf868819
201039_1
apengine/apeng/BWinsCw/ApEngine_EKA2U.def
apengine/apeng/Data/ApEngine.rss
apengine/apeng/Doc/S60_Access_Point_Engine_Design_C.doc
apengine/apeng/EABI/ApEngine_EKA2U.def
apengine/apeng/Rom/ApEngine.iby
apengine/apeng/Rom/ApEngineResources.iby
apengine/apeng/cenrep/keys_accesspoints.xls
apengine/apeng/conf/accesspoints.confml
apengine/apeng/conf/accesspoints_10008D3A.crml
apengine/apeng/conf/accesspoints_10008D3B.crml
apengine/apeng/group/APEngine.MMP
apengine/apeng/group/ApEngineCvt.mmp
apengine/apeng/group/bld.inf
apengine/apeng/inc/APEngineVariant.hrh
apengine/apeng/inc/APItemCdmaData.h
apengine/apeng/inc/APItemExtra.h
apengine/apeng/inc/APItemWlanData.h
apengine/apeng/inc/ActiveApDbNotifier.h
apengine/apeng/inc/ApEngineCommons.h
apengine/apeng/inc/ApEngineLogger.h
apengine/apeng/inc/ApEnginePrivateCRKeys.h
apengine/apeng/inc/ApListItemKey.h
apengine/apeng/inc/ApSpeedLookup.h
apengine/apeng/loc/apengine.loc
apengine/apeng/src/APAccessPointItem.cpp
apengine/apeng/src/APDataHandler.cpp
apengine/apeng/src/APNetworks.cpp
apengine/apeng/src/APSelect.cpp
apengine/apeng/src/APUtils.cpp
apengine/apeng/src/ActiveApDb.cpp
apengine/apeng/src/ActiveApDbNotifier.cpp
apengine/apeng/src/ApEngineCommons.cpp
apengine/apeng/src/ApEngineLogger.cpp
apengine/apeng/src/ApListItem.cpp
apengine/apeng/src/ApListItemKey.cpp
apengine/apeng/src/ApNetworkItem.cpp
apengine/apeng/src/ApProtHandler.cpp
apengine/apeng/src/VpnApEngine.cpp
apengine/apeng/src/VpnApItem.cpp
apengine/apeng/src/aplistitemlist.cpp
apengine/apeng/src/apnetworkitemlist.cpp
apengine/apsettingshandlerui/BMARM/APSETTINGSHANDLERUIU.DEF
apengine/apsettingshandlerui/BMARM/ApSettingsHandlerUI_EKA2U.def
apengine/apsettingshandlerui/BWINS/APSETTINGSHANDLERUIU.DEF
apengine/apsettingshandlerui/BWinsCw/APSETTINGSHANDLERUIU.DEF
apengine/apsettingshandlerui/BWinsCw/ApSettingsHandlerUI_EKA2U.def
apengine/apsettingshandlerui/Doc/S60_Access_Point_Settings_UI_Design_C.doc
apengine/apsettingshandlerui/EABI/ApSettingsHandlerUI_EKA2U.def
apengine/apsettingshandlerui/Rom/ApSettingsHandlerUI.iby
apengine/apsettingshandlerui/Rom/ApSettingsHandlerUIResources.iby
apengine/apsettingshandlerui/data/apsetui.rss
apengine/apsettingshandlerui/group/ApSettingsHandlerUiCvt.mmp
apengine/apsettingshandlerui/group/Apsettingshandlerui.mmp
apengine/apsettingshandlerui/group/apsettingshandleruiicons.mk
apengine/apsettingshandlerui/group/apsettingshandleruiicons_dc.mk
apengine/apsettingshandlerui/group/bld.inf
apengine/apsettingshandlerui/inc/APSettingsHandlerUIVariant.hrh
apengine/apsettingshandlerui/inc/AccessPointTextSettingPage.h
apengine/apsettingshandlerui/inc/ApMultiLineDataQueryDialog.h
apengine/apsettingshandlerui/inc/ApNetSelPopupList.h
apengine/apsettingshandlerui/inc/ApNetSelectorListBoxModel.h
apengine/apsettingshandlerui/inc/ApSelPopupList.h
apengine/apsettingshandlerui/inc/ApSelQueryDialog.h
apengine/apsettingshandlerui/inc/ApSelectorDialog.h
apengine/apsettingshandlerui/inc/ApSelectorListBoxModel.h
apengine/apsettingshandlerui/inc/ApSelectorListbox.h
apengine/apsettingshandlerui/inc/ApSettingsDlg.h
apengine/apsettingshandlerui/inc/ApSettingsHandlerConsts.h
apengine/apsettingshandlerui/inc/ApSettingsHandlerLogger.h
apengine/apsettingshandlerui/inc/ApSettingsHandlerUI.hrh
apengine/apsettingshandlerui/inc/ApSettingsHandlerUiPrivateCRKeys.h
apengine/apsettingshandlerui/inc/ApSettingsLookups.h
apengine/apsettingshandlerui/inc/ApSettingsModel.h
apengine/apsettingshandlerui/inc/Apsettingsdeleteoperation.h
apengine/apsettingshandlerui/inc/ApsettingshandleruiImpl.h
apengine/apsettingshandlerui/inc/FeatureManagerWrapper.h
apengine/apsettingshandlerui/inc/TextOverrides.h
apengine/apsettingshandlerui/inc/apsettingsui.h
apengine/apsettingshandlerui/loc/apsettingshandlerui.loc
apengine/apsettingshandlerui/src/AccessPointTextSettingPage.cpp
apengine/apsettingshandlerui/src/ApMultiLineDataQueryDialog.cpp
apengine/apsettingshandlerui/src/ApNetSelPopupList.cpp
apengine/apsettingshandlerui/src/ApNetSelectorListBoxModel.cpp
apengine/apsettingshandlerui/src/ApSelPopupList.cpp
apengine/apsettingshandlerui/src/ApSelQueryDialog.cpp
apengine/apsettingshandlerui/src/ApSelectorDialog.cpp
apengine/apsettingshandlerui/src/ApSelectorListBox.cpp
apengine/apsettingshandlerui/src/ApSelectorListBoxModel.cpp
apengine/apsettingshandlerui/src/ApSettingsCommons.cpp
apengine/apsettingshandlerui/src/ApSettingsDlg.cpp
apengine/apsettingshandlerui/src/ApSettingsModel.cpp
apengine/apsettingshandlerui/src/FeatureManagerWrapper.cpp
apengine/apsettingshandlerui/src/TextOverrides.cpp
apengine/apsettingshandlerui/src/apsettingsdeleteoperation.cpp
apengine/apsettingshandlerui/src/apsettingshandlerui.cpp
apengine/apsettingshandlerui/src/apsettingshandleruiImpl.cpp
apengine/apsettingshandlerui/src/apsettingsui.cpp
apengine/group/bld.inf
bearermanagement/S60MCPR/inc/s60mcpr.h
bearermanagement/S60MCPR/inc/s60mcprstates.h
bearermanagement/S60MCPR/src/s60mcpr.cpp
bearermanagement/S60MCPR/src/s60mcpractivities.cpp
bearermanagement/S60MCPR/src/s60mcprerrorrecoveryactivity.cpp
bearermanagement/S60MCPR/src/s60mcprmobilityactivity.cpp
bearermanagement/S60MCPR/src/s60mcprstates.cpp
bearermanagement/mpm/group/mpmserver.mmp
bearermanagement/mpm/inc/mpmconfirmdlg.h
bearermanagement/mpm/inc/mpmcsidwatcher.h
bearermanagement/mpm/inc/mpmdatausagewatcher.h
bearermanagement/mpm/inc/mpmdialogbase.h
bearermanagement/mpm/inc/mpmdtmwatcher.h
bearermanagement/mpm/inc/mpmlogger.h
bearermanagement/mpm/inc/mpmscheduler.h
bearermanagement/mpm/inc/mpmserver.h
bearermanagement/mpm/inc/mpmvpntogglewatcher.h
bearermanagement/mpm/src/mpmconfirmdlg.cpp
bearermanagement/mpm/src/mpmconnmonevents.cpp
bearermanagement/mpm/src/mpmcsidwatcher.cpp
bearermanagement/mpm/src/mpmdatausagewatcher.cpp
bearermanagement/mpm/src/mpmdialogbase.cpp
bearermanagement/mpm/src/mpmdtmwatcher.cpp
bearermanagement/mpm/src/mpmscheduler.cpp
bearermanagement/mpm/src/mpmserver.cpp
bearermanagement/mpm/src/mpmserversession.cpp
bearermanagement/mpm/src/mpmstarter.cpp
bearermanagement/mpm/src/mpmvpntogglewatcher.cpp
connectionmonitoring/connmon/connectionmonitor/BWINSCW/CONNMON_EKA2U.def
connectionmonitoring/connmon/connectionmonitor/EABI/ConnMon_EKA2U.def
connectionmonitoring/connmon/connectionmonitor/group/ConnMon.mmp
connectionmonitoring/connmon/connectionmonitor/inc/CPsdFax.h
connectionmonitoring/connmon/connectionmonitor/inc/ConnMonIAP.h
connectionmonitoring/connmon/connectionmonitor/inc/ConnMonServ.h
connectionmonitoring/connmon/connectionmonitor/inc/ConnMonSess.h
connectionmonitoring/connmon/connectionmonitor/inc/connmonasyncstopdaemon.h
connectionmonitoring/connmon/connectionmonitor/src/CPsdFax.cpp
connectionmonitoring/connmon/connectionmonitor/src/ConnMonCli.cpp
connectionmonitoring/connmon/connectionmonitor/src/ConnMonIAP.cpp
connectionmonitoring/connmon/connectionmonitor/src/ConnMonServ.cpp
connectionmonitoring/connmon/connectionmonitor/src/ConnMonSess.cpp
connectionmonitoring/connmon/connectionmonitor/src/RConnMon.cpp
connectionmonitoring/connmon/connectionmonitor/src/connmonasyncstopdaemon.cpp
group/bld.inf
ipcm_plat/access_point_engine_misc_api/access_point_engine_misc_api.metaxml
ipcm_plat/access_point_engine_misc_api/group/bld.inf
ipcm_plat/access_point_engine_misc_api/inc/ApProtHandler.h
ipcm_plat/access_point_engine_misc_api/inc/VpnAPEngine.h
ipcm_plat/access_point_engine_misc_api/inc/VpnAPItem.h
ipcm_plat/group/bld.inf
ipcm_pub/access_point_engine_api/access_point_settings_handler_api.metaxml
ipcm_pub/access_point_engine_api/group/bld.inf
ipcm_pub/access_point_engine_api/inc/APAccessPointItem.h
ipcm_pub/access_point_engine_api/inc/APDataHandler.h
ipcm_pub/access_point_engine_api/inc/APNetworks.h
ipcm_pub/access_point_engine_api/inc/APSelect.h
ipcm_pub/access_point_engine_api/inc/APUtils.h
ipcm_pub/access_point_engine_api/inc/ActiveApDb.h
ipcm_pub/access_point_engine_api/inc/ApEngineConsts.h
ipcm_pub/access_point_engine_api/inc/ApEngineVer.h
ipcm_pub/access_point_engine_api/inc/ApListItem.h
ipcm_pub/access_point_engine_api/inc/ApNetworkItem.h
ipcm_pub/access_point_engine_api/inc/ApNetworkItemlist.h
ipcm_pub/access_point_engine_api/inc/Aplistitemlist.h
ipcm_pub/access_point_settings_handler_api/access_point_engine_api.metaxml
ipcm_pub/access_point_settings_handler_api/group/bld.inf
ipcm_pub/access_point_settings_handler_api/inc/ApSettingsHandlerCommons.h
ipcm_pub/access_point_settings_handler_api/inc/Apsettingshandlerui.h
ipcm_pub/connection_monitor_server_api/inc/rconnmon.h
ipcm_pub/connection_settings_api/inc/cmconnectionmethoddef.h
ipcm_pub/connection_settings_api/inc/cmdestination.h
ipcm_pub/group/bld.inf
package_definition.xml
--- a/apengine/apeng/BWinsCw/ApEngine_EKA2U.def	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,181 +0,0 @@
-EXPORTS
-	??0CApAccessPointItem@@IAE@XZ @ 1 NONAME ; CApAccessPointItem::CApAccessPointItem(void)
-	??0CApDataHandler@@IAE@XZ @ 2 NONAME ; CApDataHandler::CApDataHandler(void)
-	??0CApListItem@@IAE@XZ @ 3 NONAME ; CApListItem::CApListItem(void)
-	??0CApListItemList@@QAE@XZ @ 4 NONAME ; CApListItemList::CApListItemList(void)
-	??0CApNetworkItem@@AAE@XZ @ 5 NONAME ; CApNetworkItem::CApNetworkItem(void)
-	??0CApNetworkItemList@@QAE@XZ @ 6 NONAME ; CApNetworkItemList::CApNetworkItemList(void)
-	??0CApNetworks@@AAE@XZ @ 7 NONAME ; CApNetworks::CApNetworks(void)
-	??0CApSelect@@IAE@XZ @ 8 NONAME ; CApSelect::CApSelect(void)
-	??0CApUtils@@IAE@XZ @ 9 NONAME ; CApUtils::CApUtils(void)
-	??0CVpnApEngine@@AAE@XZ @ 10 NONAME ; CVpnApEngine::CVpnApEngine(void)
-	??0CVpnApItem@@AAE@XZ @ 11 NONAME ; CVpnApItem::CVpnApItem(void)
-	??1CActiveApDb@@UAE@XZ @ 12 NONAME ; CActiveApDb::~CActiveApDb(void)
-	??1CApAccessPointItem@@UAE@XZ @ 13 NONAME ; CApAccessPointItem::~CApAccessPointItem(void)
-	??1CApDataHandler@@UAE@XZ @ 14 NONAME ; CApDataHandler::~CApDataHandler(void)
-	??1CApListItem@@UAE@XZ @ 15 NONAME ; CApListItem::~CApListItem(void)
-	??1CApListItemList@@UAE@XZ @ 16 NONAME ; CApListItemList::~CApListItemList(void)
-	??1CApNetworkItem@@UAE@XZ @ 17 NONAME ; CApNetworkItem::~CApNetworkItem(void)
-	??1CApNetworkItemList@@UAE@XZ @ 18 NONAME ; CApNetworkItemList::~CApNetworkItemList(void)
-	??1CApNetworks@@UAE@XZ @ 19 NONAME ; CApNetworks::~CApNetworks(void)
-	??1CApSelect@@UAE@XZ @ 20 NONAME ; CApSelect::~CApSelect(void)
-	??1CApUtils@@UAE@XZ @ 21 NONAME ; CApUtils::~CApUtils(void)
-	??1CVpnApEngine@@UAE@XZ @ 22 NONAME ; CVpnApEngine::~CVpnApEngine(void)
-	??1CVpnApItem@@UAE@XZ @ 23 NONAME ; CVpnApItem::~CVpnApItem(void)
-	??8CApAccessPointItem@@QBEHABV0@@Z @ 24 NONAME ; int CApAccessPointItem::operator==(class CApAccessPointItem const &) const
-	??8CVpnApItem@@QBEHABV0@@Z @ 25 NONAME ; int CVpnApItem::operator==(class CVpnApItem const &) const
-	??9CApAccessPointItem@@QBEHABV0@@Z @ 26 NONAME ; int CApAccessPointItem::operator!=(class CApAccessPointItem const &) const
-	??9CVpnApItem@@QBEHABV0@@Z @ 27 NONAME ; int CVpnApItem::operator!=(class CVpnApItem const &) const
-	?AccessPointDataL@CApDataHandler@@QAEXKAAVCApAccessPointItem@@@Z @ 28 NONAME ; void CApDataHandler::AccessPointDataL(unsigned long, class CApAccessPointItem &)
-	?AddObserverL@CActiveApDb@@QAEXPAVMActiveApDbObserver@@@Z @ 29 NONAME ; void CActiveApDb::AddObserverL(class MActiveApDbObserver *)
-	?AllListItemDataL@CApNetworks@@QAEHAAVCApNetworkItemList@@@Z @ 30 NONAME ; int CApNetworks::AllListItemDataL(class CApNetworkItemList &)
-	?AllListItemDataL@CApSelect@@QAEHAAVCApListItemList@@@Z @ 31 NONAME ; int CApSelect::AllListItemDataL(class CApListItemList &)
-	?BearerFilter@CApSelect@@QAEHXZ @ 32 NONAME ; int CApSelect::BearerFilter(void)
-	?BearerType@CApListItem@@QAE?AW4TApBearerType@@XZ @ 33 NONAME ; enum TApBearerType CApListItem::BearerType(void)
-	?BearerType@CApSelect@@QAE?AW4TApBearerType@@XZ @ 34 NONAME ; enum TApBearerType CApSelect::BearerType(void)
-	?BearerTypeL@CApAccessPointItem@@QAE?AW4TApBearerType@@XZ @ 35 NONAME ; enum TApBearerType CApAccessPointItem::BearerTypeL(void)
-	?BearerTypeL@CApUtils@@QAE?AW4TApBearerType@@K@Z @ 36 NONAME ; enum TApBearerType CApUtils::BearerTypeL(unsigned long)
-	?ConnectionName@CApAccessPointItem@@QBEABVTDesC16@@XZ @ 37 NONAME ; class TDesC16 const & CApAccessPointItem::ConnectionName(void) const
-	?ConstructL@CApAccessPointItem@@IAEXXZ @ 38 NONAME ; void CApAccessPointItem::ConstructL(void)
-	?ConstructL@CApDataHandler@@IAEXAAVCCommsDatabase@@@Z @ 39 NONAME ; void CApDataHandler::ConstructL(class CCommsDatabase &)
-	?ConstructL@CApListItem@@IAEXW4TCommsDbIspType@@KABVTDesC16@@W4TApBearerType@@1@Z @ 40 NONAME ; void CApListItem::ConstructL(enum TCommsDbIspType, unsigned long, class TDesC16 const &, enum TApBearerType, class TDesC16 const &)
-	?ConstructL@CApListItem@@IAEXW4TCommsDbIspType@@KABVTDesC16@@W4TApBearerType@@@Z @ 41 NONAME ; void CApListItem::ConstructL(enum TCommsDbIspType, unsigned long, class TDesC16 const &, enum TApBearerType)
-	?ConstructL@CApListItem@@IAEXXZ @ 42 NONAME ; void CApListItem::ConstructL(void)
-	?ConstructL@CApNetworkItem@@AAEXKABVTDesC16@@@Z @ 43 NONAME ; void CApNetworkItem::ConstructL(unsigned long, class TDesC16 const &)
-	?ConstructL@CApNetworkItem@@AAEXXZ @ 44 NONAME ; void CApNetworkItem::ConstructL(void)
-	?ConstructL@CApNetworks@@AAEXAAVCCommsDatabase@@@Z @ 45 NONAME ; void CApNetworks::ConstructL(class CCommsDatabase &)
-	?ConstructL@CApSelect@@IAEXAAVCCommsDatabase@@HHH@Z @ 46 NONAME ; void CApSelect::ConstructL(class CCommsDatabase &, int, int, int)
-	?ConstructL@CApSelect@@IAEXAAVCCommsDatabase@@HHHH@Z @ 47 NONAME ; void CApSelect::ConstructL(class CCommsDatabase &, int, int, int, int)
-	?ConstructL@CApSelect@@IAEXAAVCCommsDatabase@@HHHHW4TVpnFilterType@@@Z @ 48 NONAME ; void CApSelect::ConstructL(class CCommsDatabase &, int, int, int, int, enum TVpnFilterType)
-	?ConstructL@CApUtils@@IAEXAAVCCommsDatabase@@@Z @ 49 NONAME ; void CApUtils::ConstructL(class CCommsDatabase &)
-	?ConstructL@CVpnApEngine@@IAEXPAVCCommsDatabase@@@Z @ 50 NONAME ; void CVpnApEngine::ConstructL(class CCommsDatabase *)
-	?ConstructL@CVpnApItem@@IAEXXZ @ 51 NONAME ; void CVpnApItem::ConstructL(void)
-	?CopyFromL@CApAccessPointItem@@QAEXABV1@@Z @ 52 NONAME ; void CApAccessPointItem::CopyFromL(class CApAccessPointItem const &)
-	?CopyFromL@CApListItem@@QAEXABV1@@Z @ 53 NONAME ; void CApListItem::CopyFromL(class CApListItem const &)
-	?CopyFromL@CApNetworkItem@@QAEXABV1@@Z @ 54 NONAME ; void CApNetworkItem::CopyFromL(class CApNetworkItem const &)
-	?CopyFromL@CVpnApItem@@QAEXABV1@@Z @ 55 NONAME ; void CVpnApItem::CopyFromL(class CVpnApItem const &)
-	?Count@CApNetworks@@QBEKXZ @ 56 NONAME ; unsigned long CApNetworks::Count(void) const
-	?Count@CApSelect@@QAEKXZ @ 57 NONAME ; unsigned long CApSelect::Count(void)
-	?CreateCopyFromL@CApDataHandler@@QAEKK@Z @ 58 NONAME ; unsigned long CApDataHandler::CreateCopyFromL(unsigned long)
-	?CreateFromDataL@CApDataHandler@@QAEKAAVCApAccessPointItem@@@Z @ 59 NONAME ; unsigned long CApDataHandler::CreateFromDataL(class CApAccessPointItem &)
-	?CreateNetworkL@CApDataHandler@@QAEXAAVCApNetworkItem@@@Z @ 60 NONAME ; void CApDataHandler::CreateNetworkL(class CApNetworkItem &)
-	?CreateVpnApL@CVpnApEngine@@QAEKAAVCVpnApItem@@@Z @ 61 NONAME ; unsigned long CVpnApEngine::CreateVpnApL(class CVpnApItem &)
-	?CreateVpnApL@CVpnApEngine@@QAEKAAVTDesC16@@K0PAV2@K@Z @ 62 NONAME ; unsigned long CVpnApEngine::CreateVpnApL(class TDesC16 &, unsigned long, class TDesC16 &, class TDesC16 *, unsigned long)
-	?Cvt@CVpnApEngine@@SAHXZ @ 63 NONAME ; int CVpnApEngine::Cvt(void)
-	?Database@CActiveApDb@@QAEPAVCCommsDatabase@@XZ @ 64 NONAME ; class CCommsDatabase * CActiveApDb::Database(void)
-	?DefaultL@CApDataHandler@@QBEKH@Z @ 65 NONAME ; unsigned long CApDataHandler::DefaultL(int) const
-	?DefaultL@CApDataHandler@@QBEKHAAH@Z @ 66 NONAME ; unsigned long CApDataHandler::DefaultL(int, int &) const
-	?DeleteVpnL@CVpnApEngine@@QAEXK@Z @ 67 NONAME ; void CVpnApEngine::DeleteVpnL(unsigned long)
-	?DoHasMandatoryFieldsFilledL@CApUtils@@QAEHKPAVCCommsDbTableView@@W4TApBearerType@@@Z @ 68 NONAME ; int CApUtils::DoHasMandatoryFieldsFilledL(unsigned long, class CCommsDbTableView *, enum TApBearerType)
-	?GetPreferredIfDbIapTypeL@CApDataHandler@@QAEXKW4TCommDbConnectionDirection@@AAK11@Z @ 69 NONAME ; void CApDataHandler::GetPreferredIfDbIapTypeL(unsigned long, enum TCommDbConnectionDirection, unsigned long &, unsigned long &, unsigned long &)
-	?GetPreferredIfDbIspTypeL@CApDataHandler@@QAEABVTDesC16@@KW4TCommDbConnectionDirection@@AAK111@Z @ 70 NONAME ; class TDesC16 const & CApDataHandler::GetPreferredIfDbIspTypeL(unsigned long, enum TCommDbConnectionDirection, unsigned long &, unsigned long &, unsigned long &, unsigned long &)
-	?HasMandatoryFieldsFilledL@CApUtils@@QAEHK@Z @ 71 NONAME ; int CApUtils::HasMandatoryFieldsFilledL(unsigned long)
-	?HasSameIspAndBearerL@CApAccessPointItem@@QAEHAAV1@@Z @ 72 NONAME ; int CApAccessPointItem::HasSameIspAndBearerL(class CApAccessPointItem &)
-	?IAPExistsL@CApUtils@@QAEHK@Z @ 73 NONAME ; int CApUtils::IAPExistsL(unsigned long)
-	?ISPTypeL@CApUtils@@QAEXKAAW4TCommsDbIspType@@@Z @ 74 NONAME ; void CApUtils::ISPTypeL(unsigned long, enum TCommsDbIspType &)
-	?IapIdFromWapIdL@CApUtils@@QAEKK@Z @ 75 NONAME ; unsigned long CApUtils::IapIdFromWapIdL(unsigned long)
-	?IsAPInUseL@CApUtils@@QAEHK@Z @ 76 NONAME ; int CApUtils::IsAPInUseL(unsigned long)
-	?IsApProtectedL@CApProtHandler@@SAHPAVCCommsDatabase@@K@Z @ 77 NONAME ; int CApProtHandler::IsApProtectedL(class CCommsDatabase *, unsigned long)
-	?IsPreferencesProtectedL@CApProtHandler@@SAHPAVCCommsDatabase@@@Z @ 78 NONAME ; int CApProtHandler::IsPreferencesProtectedL(class CCommsDatabase *)
-	?IsReadOnly@CApAccessPointItem@@QBEHXZ @ 79 NONAME ; int CApAccessPointItem::IsReadOnly(void) const
-	?IsReadOnly@CApListItem@@QBEHXZ @ 80 NONAME ; int CApListItem::IsReadOnly(void) const
-	?IsReadOnly@CApSelect@@QBEHXZ @ 81 NONAME ; int CApSelect::IsReadOnly(void) const
-	?IsReadOnlyL@CApUtils@@QAEHK@Z @ 82 NONAME ; int CApUtils::IsReadOnlyL(unsigned long)
-	?IsTableProtectedL@CApProtHandler@@SAHPAVCCommsDatabase@@@Z @ 83 NONAME ; int CApProtHandler::IsTableProtectedL(class CCommsDatabase *)
-	?IsValidNameL@CApUtils@@QAEHABVTDesC16@@@Z @ 84 NONAME ; int CApUtils::IsValidNameL(class TDesC16 const &)
-	?IsValidNameL@CApUtils@@QAEHABVTDesC16@@K@Z @ 85 NONAME ; int CApUtils::IsValidNameL(class TDesC16 const &, unsigned long)
-	?IsVpnApL@CVpnApEngine@@QAEHK@Z @ 86 NONAME ; int CVpnApEngine::IsVpnApL(unsigned long)
-	?IspTypeFilter@CApSelect@@QAEHXZ @ 87 NONAME ; int CApSelect::IspTypeFilter(void)
-	?ItemForUid@CApListItemList@@QBEPAVCApListItem@@K@Z @ 88 NONAME ; class CApListItem * CApListItemList::ItemForUid(unsigned long) const
-	?ItemForUid@CApNetworkItemList@@QBEPBVCApNetworkItem@@K@Z @ 89 NONAME ; class CApNetworkItem const * CApNetworkItemList::ItemForUid(unsigned long) const
-	?MakeValidNameL@CApUtils@@QAEHAAVTDes16@@@Z @ 90 NONAME ; int CApUtils::MakeValidNameL(class TDes16 &)
-	?MoveLast@CApSelect@@QAEHXZ @ 91 NONAME ; int CApSelect::MoveLast(void)
-	?MoveNext@CApSelect@@QAEHXZ @ 92 NONAME ; int CApSelect::MoveNext(void)
-	?MovePrev@CApSelect@@QAEHXZ @ 93 NONAME ; int CApSelect::MovePrev(void)
-	?MoveToFirst@CApSelect@@QAEHXZ @ 94 NONAME ; int CApSelect::MoveToFirst(void)
-	?Name@CApListItem@@QAEABVTDesC16@@XZ @ 95 NONAME ; class TDesC16 const & CApListItem::Name(void)
-	?Name@CApNetworkItem@@QBEABVTDesC16@@XZ @ 96 NONAME ; class TDesC16 const & CApNetworkItem::Name(void) const
-	?Name@CApSelect@@QAEABVTDesC16@@XZ @ 97 NONAME ; class TDesC16 const & CApSelect::Name(void)
-	?Name@CVpnApItem@@QBEABVTDesC16@@XZ @ 98 NONAME ; class TDesC16 const & CVpnApItem::Name(void) const
-	?NameL@CApNetworks@@QBEABVTDesC16@@K@Z @ 99 NONAME ; class TDesC16 const & CApNetworks::NameL(unsigned long) const
-	?NameL@CApUtils@@QAEXKAAVTDes16@@@Z @ 100 NONAME ; void CApUtils::NameL(unsigned long, class TDes16 &)
-	?NewL@CActiveApDb@@SAPAV1@W4TCommDbDatabaseType@@@Z @ 101 NONAME ; class CActiveApDb * CActiveApDb::NewL(enum TCommDbDatabaseType)
-	?NewLC@CApAccessPointItem@@SAPAV1@XZ @ 102 NONAME ; class CApAccessPointItem * CApAccessPointItem::NewLC(void)
-	?NewLC@CApDataHandler@@SAPAV1@AAVCCommsDatabase@@@Z @ 103 NONAME ; class CApDataHandler * CApDataHandler::NewLC(class CCommsDatabase &)
-	?NewLC@CApListItem@@SAPAV1@PAV1@@Z @ 104 NONAME ; class CApListItem * CApListItem::NewLC(class CApListItem *)
-	?NewLC@CApListItem@@SAPAV1@W4TCommsDbIspType@@KABVTDesC16@@W4TApBearerType@@1H@Z @ 105 NONAME ; class CApListItem * CApListItem::NewLC(enum TCommsDbIspType, unsigned long, class TDesC16 const &, enum TApBearerType, class TDesC16 const &, int)
-	?NewLC@CApListItem@@SAPAV1@W4TCommsDbIspType@@KABVTDesC16@@W4TApBearerType@@@Z @ 106 NONAME ; class CApListItem * CApListItem::NewLC(enum TCommsDbIspType, unsigned long, class TDesC16 const &, enum TApBearerType)
-	?NewLC@CApListItem@@SAPAV1@XZ @ 107 NONAME ; class CApListItem * CApListItem::NewLC(void)
-	?NewLC@CApNetworkItem@@SAPAV1@PAV1@@Z @ 108 NONAME ; class CApNetworkItem * CApNetworkItem::NewLC(class CApNetworkItem *)
-	?NewLC@CApNetworkItem@@SAPAV1@XZ @ 109 NONAME ; class CApNetworkItem * CApNetworkItem::NewLC(void)
-	?NewLC@CApNetworks@@SAPAV1@AAVCCommsDatabase@@@Z @ 110 NONAME ; class CApNetworks * CApNetworks::NewLC(class CCommsDatabase &)
-	?NewLC@CApSelect@@SAPAV1@AAVCCommsDatabase@@HHH@Z @ 111 NONAME ; class CApSelect * CApSelect::NewLC(class CCommsDatabase &, int, int, int)
-	?NewLC@CApSelect@@SAPAV1@AAVCCommsDatabase@@HHHH@Z @ 112 NONAME ; class CApSelect * CApSelect::NewLC(class CCommsDatabase &, int, int, int, int)
-	?NewLC@CApSelect@@SAPAV1@AAVCCommsDatabase@@HHHHW4TVpnFilterType@@@Z @ 113 NONAME ; class CApSelect * CApSelect::NewLC(class CCommsDatabase &, int, int, int, int, enum TVpnFilterType)
-	?NewLC@CApUtils@@SAPAV1@AAVCCommsDatabase@@@Z @ 114 NONAME ; class CApUtils * CApUtils::NewLC(class CCommsDatabase &)
-	?NewLC@CVpnApEngine@@SAPAV1@PAVCCommsDatabase@@@Z @ 115 NONAME ; class CVpnApEngine * CVpnApEngine::NewLC(class CCommsDatabase *)
-	?NewLC@CVpnApItem@@SAPAV1@XZ @ 116 NONAME ; class CVpnApItem * CVpnApItem::NewLC(void)
-	?ProtectItemL@CApProtHandler@@SAXPAVCCommsDatabase@@K@Z @ 117 NONAME ; void CApProtHandler::ProtectItemL(class CCommsDatabase *, unsigned long)
-	?ProtectPreferencesL@CApProtHandler@@SAXPAVCCommsDatabase@@@Z @ 118 NONAME ; void CApProtHandler::ProtectPreferencesL(class CCommsDatabase *)
-	?ProtectTableL@CApProtHandler@@SAXPAVCCommsDatabase@@@Z @ 119 NONAME ; void CApProtHandler::ProtectTableL(class CCommsDatabase *)
-	?ReadBool@CApAccessPointItem@@QAEHW4TApMember@@AAH@Z @ 120 NONAME ; int CApAccessPointItem::ReadBool(enum TApMember, int &)
-	?ReadBool@CVpnApItem@@QAEHW4TVpnApMember@@AAH@Z @ 121 NONAME ; int CVpnApItem::ReadBool(enum TVpnApMember, int &)
-	?ReadConstLongTextL@CApAccessPointItem@@QAEPBVHBufC16@@W4TApMember@@@Z @ 122 NONAME ; class HBufC16 const * CApAccessPointItem::ReadConstLongTextL(enum TApMember)
-	?ReadConstLongTextL@CVpnApItem@@QAEPBVHBufC16@@W4TVpnApMember@@@Z @ 123 NONAME ; class HBufC16 const * CVpnApItem::ReadConstLongTextL(enum TVpnApMember)
-	?ReadLongTextL@CApAccessPointItem@@QAEPAVHBufC16@@W4TApMember@@@Z @ 124 NONAME ; class HBufC16 * CApAccessPointItem::ReadLongTextL(enum TApMember)
-	?ReadNetworkL@CApDataHandler@@QAEXKAAVCApNetworkItem@@@Z @ 125 NONAME ; void CApDataHandler::ReadNetworkL(unsigned long, class CApNetworkItem &)
-	?ReadNetworkPartL@CApDataHandler@@QAEXAAVCApAccessPointItem@@@Z @ 126 NONAME ; void CApDataHandler::ReadNetworkPartL(class CApAccessPointItem &)
-	?ReadTextL@CApAccessPointItem@@QAEXW4TApMember@@AAVTDes16@@@Z @ 127 NONAME ; void CApAccessPointItem::ReadTextL(enum TApMember, class TDes16 &)
-	?ReadTextL@CApAccessPointItem@@QAEXW4TApMember@@AAVTDes8@@@Z @ 128 NONAME ; void CApAccessPointItem::ReadTextL(enum TApMember, class TDes8 &)
-	?ReadTextL@CVpnApItem@@QAEXW4TVpnApMember@@AAVTDes16@@@Z @ 129 NONAME ; void CVpnApItem::ReadTextL(enum TVpnApMember, class TDes16 &)
-	?ReadTextLengthL@CApAccessPointItem@@QAEKW4TApMember@@@Z @ 130 NONAME ; unsigned long CApAccessPointItem::ReadTextLengthL(enum TApMember)
-	?ReadUint@CApAccessPointItem@@QAEHW4TApMember@@AAK@Z @ 131 NONAME ; int CApAccessPointItem::ReadUint(enum TApMember, unsigned long &)
-	?ReadUint@CVpnApItem@@QAEHW4TVpnApMember@@AAK@Z @ 132 NONAME ; int CVpnApItem::ReadUint(enum TVpnApMember, unsigned long &)
-	?RemoveAPL@CApDataHandler@@QAEXK@Z @ 133 NONAME ; void CApDataHandler::RemoveAPL(unsigned long)
-	?RemoveNetworkL@CApDataHandler@@QAEXK@Z @ 134 NONAME ; void CApDataHandler::RemoveNetworkL(unsigned long)
-	?RemoveObserver@CActiveApDb@@QAEXPAVMActiveApDbObserver@@@Z @ 135 NONAME ; void CActiveApDb::RemoveObserver(class MActiveApDbObserver *)
-	?RemoveProtectedAccessPointsL@CApProtHandler@@SAXPAVCCommsDatabase@@@Z @ 136 NONAME ; void CApProtHandler::RemoveProtectedAccessPointsL(class CCommsDatabase *)
-	?SanityCheckOk@CApAccessPointItem@@QAEHXZ @ 137 NONAME ; int CApAccessPointItem::SanityCheckOk(void)
-	?SetAsDefaultL@CApDataHandler@@QAEXKW4TCommsDbIspType@@@Z @ 138 NONAME ; void CApDataHandler::SetAsDefaultL(unsigned long, enum TCommsDbIspType)
-	?SetBearerTypeL@CApAccessPointItem@@QAEXW4TApBearerType@@@Z @ 139 NONAME ; void CApAccessPointItem::SetBearerTypeL(enum TApBearerType)
-	?SetFiltersL@CApSelect@@QAEXHHH@Z @ 140 NONAME ; void CApSelect::SetFiltersL(int, int, int)
-	?SetISPTypeL@CApUtils@@QAEXKW4TCommsDbIspType@@@Z @ 141 NONAME ; void CApUtils::SetISPTypeL(unsigned long, enum TCommsDbIspType)
-	?SetItemL@CApListItem@@QAEXW4TCommsDbIspType@@KABVTDesC16@@W4TApBearerType@@1@Z @ 142 NONAME ; void CApListItem::SetItemL(enum TCommsDbIspType, unsigned long, class TDesC16 const &, enum TApBearerType, class TDesC16 const &)
-	?SetItemL@CApListItem@@QAEXW4TCommsDbIspType@@KABVTDesC16@@W4TApBearerType@@@Z @ 143 NONAME ; void CApListItem::SetItemL(enum TCommsDbIspType, unsigned long, class TDesC16 const &, enum TApBearerType)
-	?SetNameL@CApNetworkItem@@QAEXABVTDesC16@@@Z @ 144 NONAME ; void CApNetworkItem::SetNameL(class TDesC16 const &)
-	?SetNameL@CApUtils@@QAEXAAVTDes16@@K@Z @ 145 NONAME ; void CApUtils::SetNameL(class TDes16 &, unsigned long)
-	?SetNamesL@CApAccessPointItem@@QAEXABVTDesC16@@@Z @ 146 NONAME ; void CApAccessPointItem::SetNamesL(class TDesC16 const &)
-	?SetPreferredIfDbIapTypeL@CApDataHandler@@QAEXKW4TCommDbConnectionDirection@@KW4TCommDbDialogPref@@KH@Z @ 147 NONAME ; void CApDataHandler::SetPreferredIfDbIapTypeL(unsigned long, enum TCommDbConnectionDirection, unsigned long, enum TCommDbDialogPref, unsigned long, int)
-	?SetPreferredIfDbIspTypeL@CApDataHandler@@QAEXKW4TCommDbConnectionDirection@@KW4TCommDbDialogPref@@KKABVTDesC16@@H@Z @ 148 NONAME ; void CApDataHandler::SetPreferredIfDbIspTypeL(unsigned long, enum TCommDbConnectionDirection, unsigned long, enum TCommDbDialogPref, unsigned long, unsigned long, class TDesC16 const &, int)
-	?SetUid@CApNetworkItem@@QAEXK@Z @ 149 NONAME ; void CApNetworkItem::SetUid(unsigned long)
-	?SortOrder@CApSelect@@QAEHXZ @ 150 NONAME ; int CApSelect::SortOrder(void)
-	?StartPage@CApListItem@@QBEABVTDesC16@@XZ @ 151 NONAME ; class TDesC16 const & CApListItem::StartPage(void) const
-	?Type@CApListItem@@QAE?AW4TCommsDbIspType@@XZ @ 152 NONAME ; enum TCommsDbIspType CApListItem::Type(void)
-	?Type@CApSelect@@QAE?AW4TCommsDbIspType@@XZ @ 153 NONAME ; enum TCommsDbIspType CApSelect::Type(void)
-	?Uid@CApListItem@@QAEKXZ @ 154 NONAME ; unsigned long CApListItem::Uid(void)
-	?Uid@CApNetworkItem@@QBEKXZ @ 155 NONAME ; unsigned long CApNetworkItem::Uid(void) const
-	?Uid@CApSelect@@QAEKXZ @ 156 NONAME ; unsigned long CApSelect::Uid(void)
-	?UnprotectItemL@CApProtHandler@@SAXPAVCCommsDatabase@@K@Z @ 157 NONAME ; void CApProtHandler::UnprotectItemL(class CCommsDatabase *, unsigned long)
-	?UnprotectPreferencesL@CApProtHandler@@SAXPAVCCommsDatabase@@@Z @ 158 NONAME ; void CApProtHandler::UnprotectPreferencesL(class CCommsDatabase *)
-	?UnprotectTableL@CApProtHandler@@SAXPAVCCommsDatabase@@@Z @ 159 NONAME ; void CApProtHandler::UnprotectTableL(class CCommsDatabase *)
-	?UpdateAccessPointDataL@CApDataHandler@@QAEXAAVCApAccessPointItem@@AAH@Z @ 160 NONAME ; void CApDataHandler::UpdateAccessPointDataL(class CApAccessPointItem &, int &)
-	?UpdateVpnDataL@CVpnApEngine@@QAEXAAVCVpnApItem@@@Z @ 161 NONAME ; void CVpnApEngine::UpdateVpnDataL(class CVpnApItem &)
-	?VpnDataL@CVpnApEngine@@QAEXKAAVCVpnApItem@@@Z @ 162 NONAME ; void CVpnApEngine::VpnDataL(unsigned long, class CVpnApItem &)
-	?WapApExistsL@CApUtils@@QAEHK@Z @ 163 NONAME ; int CApUtils::WapApExistsL(unsigned long)
-	?WapBearer@CApAccessPointItem@@QBEABVTDesC16@@XZ @ 164 NONAME ; class TDesC16 const & CApAccessPointItem::WapBearer(void) const
-	?WapBearerTypeL@CApUtils@@QAEXKAAVTDes16@@@Z @ 165 NONAME ; void CApUtils::WapBearerTypeL(unsigned long, class TDes16 &)
-	?WapIdFromIapIdL@CApUtils@@QAEKK@Z @ 166 NONAME ; unsigned long CApUtils::WapIdFromIapIdL(unsigned long)
-	?WapUid@CApAccessPointItem@@QBEKXZ @ 167 NONAME ; unsigned long CApAccessPointItem::WapUid(void) const
-	?WapUid@CVpnApItem@@QBEKXZ @ 168 NONAME ; unsigned long CVpnApItem::WapUid(void) const
-	?WriteBool@CApAccessPointItem@@QAEHW4TApMember@@ABH@Z @ 169 NONAME ; int CApAccessPointItem::WriteBool(enum TApMember, int const &)
-	?WriteBool@CVpnApItem@@QAEHW4TVpnApMember@@ABH@Z @ 170 NONAME ; int CVpnApItem::WriteBool(enum TVpnApMember, int const &)
-	?WriteLongTextL@CApAccessPointItem@@QAEHW4TApMember@@ABVTDesC16@@@Z @ 171 NONAME ; int CApAccessPointItem::WriteLongTextL(enum TApMember, class TDesC16 const &)
-	?WriteLongTextL@CVpnApItem@@QAEHW4TVpnApMember@@ABVTDesC16@@@Z @ 172 NONAME ; int CVpnApItem::WriteLongTextL(enum TVpnApMember, class TDesC16 const &)
-	?WriteTextL@CApAccessPointItem@@QAEHW4TApMember@@ABVTDesC16@@@Z @ 173 NONAME ; int CApAccessPointItem::WriteTextL(enum TApMember, class TDesC16 const &)
-	?WriteTextL@CApAccessPointItem@@QAEHW4TApMember@@ABVTDesC8@@@Z @ 174 NONAME ; int CApAccessPointItem::WriteTextL(enum TApMember, class TDesC8 const &)
-	?WriteTextL@CVpnApItem@@QAEHW4TVpnApMember@@ABVTDesC16@@@Z @ 175 NONAME ; int CVpnApItem::WriteTextL(enum TVpnApMember, class TDesC16 const &)
-	?WriteUint@CApAccessPointItem@@QAEHW4TApMember@@ABK@Z @ 176 NONAME ; int CApAccessPointItem::WriteUint(enum TApMember, unsigned long const &)
-	?WriteUint@CVpnApItem@@QAEHW4TVpnApMember@@ABK@Z @ 177 NONAME ; int CVpnApItem::WriteUint(enum TVpnApMember, unsigned long const &)
-	?ConstructL@CApSelect@@IAEXAAVCCommsDatabase@@HHHHW4TVpnFilterType@@H@Z @ 178 NONAME ; void CApSelect::ConstructL(class CCommsDatabase &, int, int, int, int, enum TVpnFilterType, int)
-	?NewLC@CApSelect@@SAPAV1@AAVCCommsDatabase@@HHHHW4TVpnFilterType@@H@Z @ 179 NONAME ; class CApSelect * CApSelect::NewLC(class CCommsDatabase &, int, int, int, int, enum TVpnFilterType, int)
-
--- a/apengine/apeng/Data/ApEngine.rss	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     This file contains all the resources for the ApEngine.
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME    APNG // 4 letter ID
-
-//  INCLUDES
-#include <apengine.loc>
-#include <eikon.rh>
-
-
-//  RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE {}
-
-RESOURCE TBUF { buf="ApEngine"; }
-
-RESOURCE TBUF64 r_apng_default_ap_name                { buf =  qtn_set_ap_default_name; }
-
-RESOURCE TBUF64 r_apng_default_vpn_ap_name            { buf =  qtn_vpn_sett_vpn_iap_default_name; }
-
-// End of File
Binary file apengine/apeng/Doc/S60_Access_Point_Engine_Design_C.doc has changed
--- a/apengine/apeng/EABI/ApEngine_EKA2U.def	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,238 +0,0 @@
-EXPORTS
-	_ZN10CVpnApItem10ConstructLEv @ 1 NONAME
-	_ZN10CVpnApItem10WriteTextLE12TVpnApMemberRK7TDesC16 @ 2 NONAME
-	_ZN10CVpnApItem14WriteLongTextLE12TVpnApMemberRK7TDesC16 @ 3 NONAME
-	_ZN10CVpnApItem18ReadConstLongTextLE12TVpnApMember @ 4 NONAME
-	_ZN10CVpnApItem5NewLCEv @ 5 NONAME
-	_ZN10CVpnApItem8ReadBoolE12TVpnApMemberRi @ 6 NONAME
-	_ZN10CVpnApItem8ReadUintE12TVpnApMemberRm @ 7 NONAME
-	_ZN10CVpnApItem9CopyFromLERKS_ @ 8 NONAME
-	_ZN10CVpnApItem9ReadTextLE12TVpnApMemberR6TDes16 @ 9 NONAME
-	_ZN10CVpnApItem9WriteBoolE12TVpnApMemberRKi @ 10 NONAME
-	_ZN10CVpnApItem9WriteUintE12TVpnApMemberRKm @ 11 NONAME
-	_ZN10CVpnApItemC1Ev @ 12 NONAME
-	_ZN10CVpnApItemC2Ev @ 13 NONAME
-	_ZN10CVpnApItemD0Ev @ 14 NONAME
-	_ZN10CVpnApItemD1Ev @ 15 NONAME
-	_ZN10CVpnApItemD2Ev @ 16 NONAME
-	_ZN11CActiveApDb12AddObserverLEP19MActiveApDbObserver @ 17 NONAME
-	_ZN11CActiveApDb14RemoveObserverEP19MActiveApDbObserver @ 18 NONAME
-	_ZN11CActiveApDb4NewLE19TCommDbDatabaseType @ 19 NONAME
-	_ZN11CActiveApDb8DatabaseEv @ 20 NONAME
-	_ZN11CActiveApDbD0Ev @ 21 NONAME
-	_ZN11CActiveApDbD1Ev @ 22 NONAME
-	_ZN11CActiveApDbD2Ev @ 23 NONAME
-	_ZN11CApListItem10BearerTypeEv @ 24 NONAME
-	_ZN11CApListItem10ConstructLE15TCommsDbIspTypemRK7TDesC1613TApBearerType @ 25 NONAME
-	_ZN11CApListItem10ConstructLE15TCommsDbIspTypemRK7TDesC1613TApBearerTypeS3_ @ 26 NONAME
-	_ZN11CApListItem10ConstructLEv @ 27 NONAME
-	_ZN11CApListItem3UidEv @ 28 NONAME
-	_ZN11CApListItem4NameEv @ 29 NONAME
-	_ZN11CApListItem4TypeEv @ 30 NONAME
-	_ZN11CApListItem5NewLCE15TCommsDbIspTypemRK7TDesC1613TApBearerType @ 31 NONAME
-	_ZN11CApListItem5NewLCE15TCommsDbIspTypemRK7TDesC1613TApBearerTypeS3_i @ 32 NONAME
-	_ZN11CApListItem5NewLCEPS_ @ 33 NONAME
-	_ZN11CApListItem5NewLCEv @ 34 NONAME
-	_ZN11CApListItem8SetItemLE15TCommsDbIspTypemRK7TDesC1613TApBearerType @ 35 NONAME
-	_ZN11CApListItem8SetItemLE15TCommsDbIspTypemRK7TDesC1613TApBearerTypeS3_ @ 36 NONAME
-	_ZN11CApListItem9CopyFromLERKS_ @ 37 NONAME
-	_ZN11CApListItemC1Ev @ 38 NONAME
-	_ZN11CApListItemC2Ev @ 39 NONAME
-	_ZN11CApListItemD0Ev @ 40 NONAME
-	_ZN11CApListItemD1Ev @ 41 NONAME
-	_ZN11CApListItemD2Ev @ 42 NONAME
-	_ZN11CApNetworks10ConstructLER14CCommsDatabase @ 43 NONAME
-	_ZN11CApNetworks16AllListItemDataLER18CApNetworkItemList @ 44 NONAME
-	_ZN11CApNetworks5NewLCER14CCommsDatabase @ 45 NONAME
-	_ZN11CApNetworksC1Ev @ 46 NONAME
-	_ZN11CApNetworksC2Ev @ 47 NONAME
-	_ZN11CApNetworksD0Ev @ 48 NONAME
-	_ZN11CApNetworksD1Ev @ 49 NONAME
-	_ZN11CApNetworksD2Ev @ 50 NONAME
-	_ZN12CVpnApEngine10ConstructLEP14CCommsDatabase @ 51 NONAME
-	_ZN12CVpnApEngine10DeleteVpnLEm @ 52 NONAME
-	_ZN12CVpnApEngine12CreateVpnApLER10CVpnApItem @ 53 NONAME
-	_ZN12CVpnApEngine12CreateVpnApLER7TDesC16mS1_PS0_m @ 54 NONAME
-	_ZN12CVpnApEngine14UpdateVpnDataLER10CVpnApItem @ 55 NONAME
-	_ZN12CVpnApEngine3CvtEv @ 56 NONAME
-	_ZN12CVpnApEngine5NewLCEP14CCommsDatabase @ 57 NONAME
-	_ZN12CVpnApEngine8IsVpnApLEm @ 58 NONAME
-	_ZN12CVpnApEngine8VpnDataLEmR10CVpnApItem @ 59 NONAME
-	_ZN12CVpnApEngineC1Ev @ 60 NONAME
-	_ZN12CVpnApEngineC2Ev @ 61 NONAME
-	_ZN12CVpnApEngineD0Ev @ 62 NONAME
-	_ZN12CVpnApEngineD1Ev @ 63 NONAME
-	_ZN12CVpnApEngineD2Ev @ 64 NONAME
-	_ZN14CApDataHandler10ConstructLER14CCommsDatabase @ 65 NONAME
-	_ZN14CApDataHandler12ReadNetworkLEmR14CApNetworkItem @ 66 NONAME
-	_ZN14CApDataHandler13SetAsDefaultLEm15TCommsDbIspType @ 67 NONAME
-	_ZN14CApDataHandler14CreateNetworkLER14CApNetworkItem @ 68 NONAME
-	_ZN14CApDataHandler14RemoveNetworkLEm @ 69 NONAME
-	_ZN14CApDataHandler15CreateCopyFromLEm @ 70 NONAME
-	_ZN14CApDataHandler15CreateFromDataLER18CApAccessPointItem @ 71 NONAME
-	_ZN14CApDataHandler16AccessPointDataLEmR18CApAccessPointItem @ 72 NONAME
-	_ZN14CApDataHandler16ReadNetworkPartLER18CApAccessPointItem @ 73 NONAME
-	_ZN14CApDataHandler22UpdateAccessPointDataLER18CApAccessPointItemRi @ 74 NONAME
-	_ZN14CApDataHandler24GetPreferredIfDbIapTypeLEm26TCommDbConnectionDirectionRmS1_S1_ @ 75 NONAME
-	_ZN14CApDataHandler24GetPreferredIfDbIspTypeLEm26TCommDbConnectionDirectionRmS1_S1_S1_ @ 76 NONAME
-	_ZN14CApDataHandler24SetPreferredIfDbIapTypeLEm26TCommDbConnectionDirectionm17TCommDbDialogPrefmi @ 77 NONAME
-	_ZN14CApDataHandler24SetPreferredIfDbIspTypeLEm26TCommDbConnectionDirectionm17TCommDbDialogPrefmmRK7TDesC16i @ 78 NONAME
-	_ZN14CApDataHandler5NewLCER14CCommsDatabase @ 79 NONAME
-	_ZN14CApDataHandler9RemoveAPLEm @ 80 NONAME
-	_ZN14CApDataHandlerC1Ev @ 81 NONAME
-	_ZN14CApDataHandlerC2Ev @ 82 NONAME
-	_ZN14CApDataHandlerD0Ev @ 83 NONAME
-	_ZN14CApDataHandlerD1Ev @ 84 NONAME
-	_ZN14CApDataHandlerD2Ev @ 85 NONAME
-	_ZN14CApNetworkItem10ConstructLEmRK7TDesC16 @ 86 NONAME
-	_ZN14CApNetworkItem10ConstructLEv @ 87 NONAME
-	_ZN14CApNetworkItem5NewLCEPS_ @ 88 NONAME
-	_ZN14CApNetworkItem5NewLCEv @ 89 NONAME
-	_ZN14CApNetworkItem6SetUidEm @ 90 NONAME
-	_ZN14CApNetworkItem8SetNameLERK7TDesC16 @ 91 NONAME
-	_ZN14CApNetworkItem9CopyFromLERKS_ @ 92 NONAME
-	_ZN14CApNetworkItemC1Ev @ 93 NONAME
-	_ZN14CApNetworkItemC2Ev @ 94 NONAME
-	_ZN14CApNetworkItemD0Ev @ 95 NONAME
-	_ZN14CApNetworkItemD1Ev @ 96 NONAME
-	_ZN14CApNetworkItemD2Ev @ 97 NONAME
-	_ZN14CApProtHandler12ProtectItemLEP14CCommsDatabasem @ 98 NONAME
-	_ZN14CApProtHandler13ProtectTableLEP14CCommsDatabase @ 99 NONAME
-	_ZN14CApProtHandler14IsApProtectedLEP14CCommsDatabasem @ 100 NONAME
-	_ZN14CApProtHandler14UnprotectItemLEP14CCommsDatabasem @ 101 NONAME
-	_ZN14CApProtHandler15UnprotectTableLEP14CCommsDatabase @ 102 NONAME
-	_ZN14CApProtHandler17IsTableProtectedLEP14CCommsDatabase @ 103 NONAME
-	_ZN14CApProtHandler19ProtectPreferencesLEP14CCommsDatabase @ 104 NONAME
-	_ZN14CApProtHandler21UnprotectPreferencesLEP14CCommsDatabase @ 105 NONAME
-	_ZN14CApProtHandler23IsPreferencesProtectedLEP14CCommsDatabase @ 106 NONAME
-	_ZN14CApProtHandler28RemoveProtectedAccessPointsLEP14CCommsDatabase @ 107 NONAME
-	_ZN15CApListItemListC1Ev @ 108 NONAME
-	_ZN15CApListItemListC2Ev @ 109 NONAME
-	_ZN15CApListItemListD0Ev @ 110 NONAME
-	_ZN15CApListItemListD1Ev @ 111 NONAME
-	_ZN15CApListItemListD2Ev @ 112 NONAME
-	_ZN18CApAccessPointItem10ConstructLEv @ 113 NONAME
-	_ZN18CApAccessPointItem10WriteTextLE9TApMemberRK6TDesC8 @ 114 NONAME
-	_ZN18CApAccessPointItem10WriteTextLE9TApMemberRK7TDesC16 @ 115 NONAME
-	_ZN18CApAccessPointItem11BearerTypeLEv @ 116 NONAME
-	_ZN18CApAccessPointItem13ReadLongTextLE9TApMember @ 117 NONAME
-	_ZN18CApAccessPointItem13SanityCheckOkEv @ 118 NONAME
-	_ZN18CApAccessPointItem14SetBearerTypeLE13TApBearerType @ 119 NONAME
-	_ZN18CApAccessPointItem14WriteLongTextLE9TApMemberRK7TDesC16 @ 120 NONAME
-	_ZN18CApAccessPointItem15ReadTextLengthLE9TApMember @ 121 NONAME
-	_ZN18CApAccessPointItem18ReadConstLongTextLE9TApMember @ 122 NONAME
-	_ZN18CApAccessPointItem20HasSameIspAndBearerLERS_ @ 123 NONAME
-	_ZN18CApAccessPointItem5NewLCEv @ 124 NONAME
-	_ZN18CApAccessPointItem8ReadBoolE9TApMemberRi @ 125 NONAME
-	_ZN18CApAccessPointItem8ReadUintE9TApMemberRm @ 126 NONAME
-	_ZN18CApAccessPointItem9CopyFromLERKS_ @ 127 NONAME
-	_ZN18CApAccessPointItem9ReadTextLE9TApMemberR5TDes8 @ 128 NONAME
-	_ZN18CApAccessPointItem9ReadTextLE9TApMemberR6TDes16 @ 129 NONAME
-	_ZN18CApAccessPointItem9SetNamesLERK7TDesC16 @ 130 NONAME
-	_ZN18CApAccessPointItem9WriteBoolE9TApMemberRKi @ 131 NONAME
-	_ZN18CApAccessPointItem9WriteUintE9TApMemberRKm @ 132 NONAME
-	_ZN18CApAccessPointItemC1Ev @ 133 NONAME
-	_ZN18CApAccessPointItemC2Ev @ 134 NONAME
-	_ZN18CApAccessPointItemD0Ev @ 135 NONAME
-	_ZN18CApAccessPointItemD1Ev @ 136 NONAME
-	_ZN18CApAccessPointItemD2Ev @ 137 NONAME
-	_ZN18CApNetworkItemListC1Ev @ 138 NONAME
-	_ZN18CApNetworkItemListC2Ev @ 139 NONAME
-	_ZN18CApNetworkItemListD0Ev @ 140 NONAME
-	_ZN18CApNetworkItemListD1Ev @ 141 NONAME
-	_ZN18CApNetworkItemListD2Ev @ 142 NONAME
-	_ZN8CApUtils10ConstructLER14CCommsDatabase @ 143 NONAME
-	_ZN8CApUtils10IAPExistsLEm @ 144 NONAME
-	_ZN8CApUtils10IsAPInUseLEm @ 145 NONAME
-	_ZN8CApUtils11BearerTypeLEm @ 146 NONAME
-	_ZN8CApUtils11IsReadOnlyLEm @ 147 NONAME
-	_ZN8CApUtils11SetISPTypeLEm15TCommsDbIspType @ 148 NONAME
-	_ZN8CApUtils12IsValidNameLERK7TDesC16 @ 149 NONAME
-	_ZN8CApUtils12IsValidNameLERK7TDesC16m @ 150 NONAME
-	_ZN8CApUtils12WapApExistsLEm @ 151 NONAME
-	_ZN8CApUtils14MakeValidNameLER6TDes16 @ 152 NONAME
-	_ZN8CApUtils14WapBearerTypeLEmR6TDes16 @ 153 NONAME
-	_ZN8CApUtils15IapIdFromWapIdLEm @ 154 NONAME
-	_ZN8CApUtils15WapIdFromIapIdLEm @ 155 NONAME
-	_ZN8CApUtils25HasMandatoryFieldsFilledLEm @ 156 NONAME
-	_ZN8CApUtils27DoHasMandatoryFieldsFilledLEmP17CCommsDbTableView13TApBearerType @ 157 NONAME
-	_ZN8CApUtils5NameLEmR6TDes16 @ 158 NONAME
-	_ZN8CApUtils5NewLCER14CCommsDatabase @ 159 NONAME
-	_ZN8CApUtils8ISPTypeLEmR15TCommsDbIspType @ 160 NONAME
-	_ZN8CApUtils8SetNameLER6TDes16m @ 161 NONAME
-	_ZN8CApUtilsC1Ev @ 162 NONAME
-	_ZN8CApUtilsC2Ev @ 163 NONAME
-	_ZN8CApUtilsD0Ev @ 164 NONAME
-	_ZN8CApUtilsD1Ev @ 165 NONAME
-	_ZN8CApUtilsD2Ev @ 166 NONAME
-	_ZN9CApSelect10BearerTypeEv @ 167 NONAME
-	_ZN9CApSelect10ConstructLER14CCommsDatabaseiii @ 168 NONAME
-	_ZN9CApSelect10ConstructLER14CCommsDatabaseiiii @ 169 NONAME
-	_ZN9CApSelect10ConstructLER14CCommsDatabaseiiii14TVpnFilterType @ 170 NONAME
-	_ZN9CApSelect11MoveToFirstEv @ 171 NONAME
-	_ZN9CApSelect11SetFiltersLEiii @ 172 NONAME
-	_ZN9CApSelect12BearerFilterEv @ 173 NONAME
-	_ZN9CApSelect13IspTypeFilterEv @ 174 NONAME
-	_ZN9CApSelect16AllListItemDataLER15CApListItemList @ 175 NONAME
-	_ZN9CApSelect3UidEv @ 176 NONAME
-	_ZN9CApSelect4NameEv @ 177 NONAME
-	_ZN9CApSelect4TypeEv @ 178 NONAME
-	_ZN9CApSelect5CountEv @ 179 NONAME
-	_ZN9CApSelect5NewLCER14CCommsDatabaseiii @ 180 NONAME
-	_ZN9CApSelect5NewLCER14CCommsDatabaseiiii @ 181 NONAME
-	_ZN9CApSelect5NewLCER14CCommsDatabaseiiii14TVpnFilterType @ 182 NONAME
-	_ZN9CApSelect8MoveLastEv @ 183 NONAME
-	_ZN9CApSelect8MoveNextEv @ 184 NONAME
-	_ZN9CApSelect8MovePrevEv @ 185 NONAME
-	_ZN9CApSelect9SortOrderEv @ 186 NONAME
-	_ZN9CApSelectC1Ev @ 187 NONAME
-	_ZN9CApSelectC2Ev @ 188 NONAME
-	_ZN9CApSelectD0Ev @ 189 NONAME
-	_ZN9CApSelectD1Ev @ 190 NONAME
-	_ZN9CApSelectD2Ev @ 191 NONAME
-	_ZNK10CVpnApItem4NameEv @ 192 NONAME
-	_ZNK10CVpnApItem6WapUidEv @ 193 NONAME
-	_ZNK10CVpnApItemeqERKS_ @ 194 NONAME
-	_ZNK10CVpnApItemneERKS_ @ 195 NONAME
-	_ZNK11CApListItem10IsReadOnlyEv @ 196 NONAME
-	_ZNK11CApListItem9StartPageEv @ 197 NONAME
-	_ZNK11CApNetworks5CountEv @ 198 NONAME
-	_ZNK11CApNetworks5NameLEm @ 199 NONAME
-	_ZNK14CApDataHandler8DefaultLEi @ 200 NONAME
-	_ZNK14CApDataHandler8DefaultLEiRi @ 201 NONAME
-	_ZNK14CApNetworkItem3UidEv @ 202 NONAME
-	_ZNK14CApNetworkItem4NameEv @ 203 NONAME
-	_ZNK15CApListItemList10ItemForUidEm @ 204 NONAME
-	_ZNK18CApAccessPointItem10IsReadOnlyEv @ 205 NONAME
-	_ZNK18CApAccessPointItem14ConnectionNameEv @ 206 NONAME
-	_ZNK18CApAccessPointItem6WapUidEv @ 207 NONAME
-	_ZNK18CApAccessPointItem9WapBearerEv @ 208 NONAME
-	_ZNK18CApAccessPointItemeqERKS_ @ 209 NONAME
-	_ZNK18CApAccessPointItemneERKS_ @ 210 NONAME
-	_ZNK18CApNetworkItemList10ItemForUidEm @ 211 NONAME
-	_ZNK9CApSelect10IsReadOnlyEv @ 212 NONAME
-	_ZTI11CApListItem @ 213 NONAME ; #<TI>#
-	_ZTI12CApItemExtra @ 214 NONAME ; #<TI>#
-	_ZTI14CApDataHandler @ 215 NONAME ; #<TI>#
-	_ZTI15CApItemCdmaData @ 216 NONAME ; #<TI>#
-	_ZTI15CApItemWlanData @ 217 NONAME ; #<TI>#
-	_ZTI15CApListItemList @ 218 NONAME ; #<TI>#
-	_ZTI18CApAccessPointItem @ 219 NONAME ; #<TI>#
-	_ZTI18CApNetworkItemList @ 220 NONAME ; #<TI>#
-	_ZTI19CActiveApDbNotifier @ 221 NONAME ; #<TI>#
-	_ZTI8CApUtils @ 222 NONAME ; #<TI>#
-	_ZTI9CApSelect @ 223 NONAME ; #<TI>#
-	_ZTV11CApListItem @ 224 NONAME ; #<VT>#
-	_ZTV12CApItemExtra @ 225 NONAME ; #<VT>#
-	_ZTV14CApDataHandler @ 226 NONAME ; #<VT>#
-	_ZTV15CApItemCdmaData @ 227 NONAME ; #<VT>#
-	_ZTV15CApItemWlanData @ 228 NONAME ; #<VT>#
-	_ZTV15CApListItemList @ 229 NONAME ; #<VT>#
-	_ZTV18CApAccessPointItem @ 230 NONAME ; #<VT>#
-	_ZTV18CApNetworkItemList @ 231 NONAME ; #<VT>#
-	_ZTV19CActiveApDbNotifier @ 232 NONAME ; #<VT>#
-	_ZTV8CApUtils @ 233 NONAME ; #<VT>#
-	_ZTV9CApSelect @ 234 NONAME ; #<VT>#
-	_ZN9CApSelect10ConstructLER14CCommsDatabaseiiii14TVpnFilterTypei @ 235 NONAME
-	_ZN9CApSelect5NewLCER14CCommsDatabaseiiii14TVpnFilterTypei @ 236 NONAME
-
--- a/apengine/apeng/Rom/ApEngine.iby	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __APENGINE_IBY__
-#define __APENGINE_IBY__
-
-file=ABI_DIR\BUILD_DIR\ApEngine.dll  SHARED_LIB_DIR\ApEngine.dll
-
-#endif
--- a/apengine/apeng/Rom/ApEngineResources.iby	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __APENGINERESOURCES_IBY__
-#define __APENGINERESOURCES_IBY__
-
-DATA=DATAZ_\RESOURCE_FILES_DIR\ApEngine.rsc	RESOURCE_FILES_DIR\ApEngine.rsc
-
-#endif
Binary file apengine/apeng/cenrep/keys_accesspoints.xls has changed
Binary file apengine/apeng/conf/accesspoints.confml has changed
Binary file apengine/apeng/conf/accesspoints_10008D3A.crml has changed
Binary file apengine/apeng/conf/accesspoints_10008D3B.crml has changed
--- a/apengine/apeng/group/APEngine.MMP	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,122 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Project description file for the Access Point Engine
-*
-*/
-
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-TARGET      APEngine.dll
-TARGETTYPE      dll
-UID         0x1000008d  0x10008D3A
-
-CAPABILITY  CAP_GENERAL_DLL
-VENDORID VID_DEFAULT
-
-
-SOURCEPATH  ../src
-SOURCE      ApEngineLogger.cpp
-SOURCE      ApListItem.cpp
-SOURCE      APSelect.cpp
-SOURCE      APDataHandler.cpp
-SOURCE      APUtils.cpp
-SOURCE      APAccessPointItem.cpp
-SOURCE      ApEngineCommons.cpp
-SOURCE      ActiveApDb.cpp
-SOURCE      ActiveApDbNotifier.cpp
-SOURCE      aplistitemlist.cpp
-SOURCE      ApProtHandler.cpp
-SOURCE      ApListItemKey.cpp
-SOURCE		ApNetworkItem.cpp
-SOURCE		APNetworks.cpp
-SOURCE	    apnetworkitemlist.cpp
-SOURCE	    VpnApItem.cpp
-SOURCE	    VpnApEngine.cpp
-
-
-
-START RESOURCE ../Data/ApEngine.rss
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-LANGUAGE_IDS
-END  // RESOURCE
-
-// Component specific internal headers 
-USERINCLUDE			../inc
-
-// ADO specific internal headers 
-SYSTEMINCLUDE		../../../inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY     commdb.lib 
-LIBRARY     euser.lib
-LIBRARY     efsrv.lib
-LIBRARY     bafl.lib
-LIBRARY     insock.lib
-LIBRARY     esock.lib
-LIBRARY     FeatMgr.lib
-LIBRARY		Vpnapi.lib
-LIBRARY     centralrepository.lib
-
-#if defined(ARMCC)
-    DEFFILE ../EABI/ApEngine_EKA2.def
-#elif defined( WINSCW )
-    DEFFILE ../BWinsCw/ApEngine_EKA2.def
-#elif defined( WINS )
-    DEFFILE ../BWins/ApEngine_EKA2.def
-#else
-    DEFFILE ../BMarm/ApEngine_EKA2.def
-#endif
-
-// Define this macro if you wish to enable logging
-//#define __TEST_APENGINE_LOG_ENABLED
-
-
-// Define this macro if you wish to enable IPv6 support for testing
-// It will override FeatureManager's NOT SUPPORTED....
-//MACRO __TEST_IPV6_SUPPORT    
-
-#ifdef __TEST_APENGINE_LOG_ENABLED
-	MACRO __TEST_APENGINE_LOG__
-	LIBRARY     flogger.lib
-#endif	// __TEST_APENGINE_LOG_ENABLED
-
-// Define this to test CDMA support.
-//MACRO __TEST_CDMA_SUPPORT
-
-
-// Define this to test CSD support.
-//MACRO __TEST_CSD_SUPPORT
-
-
-// Define this to test HSCSD support.
-//MACRO __TEST_HSCSD_SUPPORT
-
-// Define this to test CDMA write-protect support.
-//MACRO __TEST_CDMA_WRITE_PROTECT
-
-// Define this to test WLAN support.
-// MACRO __TEST_WLAN_SUPPORT
-
-
-// Define this to test LAN support.
-#ifdef WINS
-    MACRO __TEST_LAN_BEARER
-#endif
-
-// End of File
--- a/apengine/apeng/group/ApEngineCvt.mmp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,44 +0,0 @@
-/*
-* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Project specification for Accesspoint Engine filter
-*               Component Validation Test.
-*      
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET      ApEngineCvt.exe
-TARGETTYPE  exe
-
-SOURCEPATH  ../tsrc
-
-SOURCE      ApEngineCvt.cpp 
-
-// Component specific internal headers 
-USERINCLUDE			../inc
-
-// ADO-SUBSYSTEM specific internal headers 
-SYSTEMINCLUDE		../../inc
-
-// ADO specific internal headers 
-SYSTEMINCLUDE		../../../inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY     ApEngine.lib
-LIBRARY	    commdb.lib
-LIBRARY     euser.lib
--- a/apengine/apeng/group/bld.inf	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Build information for the Access Point Engine
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-// export iby files
-../Rom/ApEngine.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(ApEngine.iby)
-../Rom/ApEngineResources.iby	LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(ApEngineResources.iby)
-
-// export localised loc file
-../loc/apengine.loc	MW_LAYER_LOC_EXPORT_PATH(apengine.loc)
-
-../conf/accesspoints.confml		APP_LAYER_CONFML(accesspoints.confml)
-../conf/accesspoints_10008D3A.crml	APP_LAYER_CRML(accesspoints_10008D3A.crml)
-../conf/accesspoints_10008D3B.crml	APP_LAYER_CRML(accesspoints_10008D3B.crml)
-
-PRJ_MMPFILES
-./APEngine.MMP
-
-
-
-PRJ_TESTMMPFILES
-
-// End of File
--- a/apengine/apeng/inc/APEngineVariant.hrh	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     This file contains variation info for ApEngine.
-*     The file can be included in C++ or resource file.
-*
-*/
-
-
-#ifndef APENGINEVARIANT_HRH
-#define APENGINEVARIANT_HRH
-
-// feature to disable editing of normal access points and allow it only for VPN
-#define KApUiEditOnlyVPNs 0x01
-
-#endif      //  APENGINEVARIANT_HRH
-
-
-// End of File
--- a/apengine/apeng/inc/APItemCdmaData.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of class CApItemCdmaData 
-*
-*/
-
-
-#ifndef CAPITEMCDMADATA_H
-#define CAPITEMCDMADATA_H
-
-
-//  INCLUDES
-#include <e32base.h>
-
-
-
-// CLASS DECLARATION
-
-/**
-* CDMA2000-specific data extension for CApAccessPointItem.
-* Access Point data which is common to all AP-s (ISP...), are not stored
-* here.
-*/
-class CApItemCdmaData :public CBase
-    {
-    public:
-        /**
-        * Two-phased constructor. Leaves on failure
-        * @return The constructed CApItemCdmaData.
-        */
-        static CApItemCdmaData* NewL();
-
-        /**
-        * Destructor.
-        */
-        virtual ~CApItemCdmaData();
-
-        /**
-        * C++ default constructor.
-        */
-        CApItemCdmaData();
-
-        /**
-        * Second-phase constructor.
-        */
-        void ConstructL();
-
-    public:
-        HBufC*  iIwfName;           ///< IWF name.
-        TUint32 iServiceOption;     ///< Service option.
-        TUint32 iPdpType;           ///< PDP type.
-        HBufC*  iPdpAddress;        ///< PDP address.
-        TUint32 iReqFwdPriority;    ///< Requested forward priority.
-        TUint32 iReqRevPriority;    ///< Requested reverse priority.
-        TUint32 iReqFwdBitrate;     ///< Requested forward bitrate.
-        TUint32 iReqRevBitrate;     ///< Requested reverse bitrate.
-        TUint32 iReqFwdLoss;        ///< Req. forward frame loss rate.
-        TUint32 iReqRevLoss;        ///< Req. reverse frame loss rate.
-        TUint32 iReqFwdMaxDelay;    ///< Requested forward delay.
-        TUint32 iReqRevMaxDelay;    ///< Requested reverse delay.
-        TUint32 iMinFwdBitrate;     ///< Min. acceptable fwd bitrate.
-        TUint32 iMinRevBitrate;     ///< Min. acceptable rev bitrate.
-        TUint32 iAccptFwdLoss;      ///< Max. acc. fwd frame loss rate.
-        TUint32 iAccptRevLoss;      ///< Max. acc. rev frame loss rate.
-        TUint32 iAccptFwdMaxDelay;  ///< Max. acceptable forward delay.
-        TUint32 iAccptRevMaxDelay;  ///< Max. acceptable reverse delay.
-        TUint32 iQosWarningTimeout; ///< Notify user if the requested QOS
-                                    ///< cannot be satisfied for this time in
-                                    ///< microseconds
-        TUint32 iRlpMode;           ///< Transparent or non-transparent
-                                    ///< radio link protocol.
-        // CDMA2000 deprecated Mobile IP fields
-        TBool   iMip;               ///< Attempt to use mobile IP.
-        HBufC*  iHomeAgentAddress;  ///< Home Agent address.
-        TUint32 iMipTimeout;        ///< A normal reconnect (informing the
-                                    ///< user) takes place if both the PPP link
-                                    ///< drops and a change in SID or NID is
-                                    ///< received within this time in
-                                    ///< milliseconds.
-        // CDMA2000 specific CDMA parameters provisioned through OTA and
-        // defined in TIA-683B section 3.5.8
-        // These fields replace the old Mobile IP fields (above).
-        TUint32 iNaiType;               ///< Type of NAI.
-        TUint32 iSimpleIpAuthAlgorithm; ///< SimpleIP auth.algorithm.
-        TUint32 iSimpleIpPapSsHandle;   ///< SimpleIP PAP shared secret handle
-        TUint32 iSimpleIpChapSsHandle;  ///< SimpleIP CHAP shared secret handle
-        TUint32 iMipTBit;               ///< Reverse-tunneling reqd flag.
-        HBufC*  iMipHomeAddress;        ///< Home address.
-        HBufC*  iMipPrimaryHomeAgent;   ///< IP address of mobile node's
-                                        ///< primary home agent.
-        HBufC*  iMipSecondaryHomeAgent; ///< IP address of mobile node's
-                                        ///< secondary home agent.
-        TUint32 iMipMnAaaAuthAlgorithm; ///< MN-AAA auth algorithm.
-        TUint32 iMipMnAaaSpi;           ///< MN-AAA security param index.
-        TUint32 iMipMnAaaSsHandle;      ///< MN-AAA shared secret handle.
-        TUint32 iMipMnHaAuthAlgorithm;  ///< MN-HA auth algorithm.
-        TUint32 iMipMnHaSpi;            ///< MN-HA security param index.
-        TUint32 iMipMnHaSsHandle;       ///< MN-HA shared secret handle.
-
-    };
-
-#endif      // CAPITEMCDMADATA_H
-
-// End of File
--- a/apengine/apeng/inc/APItemExtra.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,95 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of class CApItemExtra 
-*
-*/
-
-
-#ifndef CAPITEMEXTRA_H
-#define CAPITEMEXTRA_H
-
-
-//  INCLUDES
-
-// FORWARD DECLARATION
-class CApItemCdmaData;
-class CApItemWlanData;
-
-// CONSTANTS
-
-
-// CLASS DECLARATION
-
-/**
-*  Representation of the access point extra data class.
-*  Provides a way to store additional data whithout breaking BC.
-*/
-class CApItemExtra :public CBase
-    {
-    public:
-        /**
-        * Two-phased constructor. Leaves on failure
-        * @return The constructed CApItemExtra.
-        */
-        static CApItemExtra* NewL();
-
-        /**
-        * Destructor.
-        */
-        virtual ~CApItemExtra();
-
-        /**
-        * C++ default constructor.
-        */
-        CApItemExtra();
-
-        /**
-        * Second-phase constructor.
-        */
-        void ConstructL();
-    
-
-    public:
-        TBool               iIsFeatureManagerInitialised; // FALSE by default
-        TBool               iIpv6GetDNSIPFromServer;
-        TBool               iIsWcdma;
-        HBufC*              iIpv6PrimaryDNS;
-        HBufC*              iIpv6SecondaryDNS;
-        TUint               iIsIpv6Supported;   // FALSE by default
-        TBool               iIsVpnAp;           // False by default
-        TApBearerType       iVPnRealIapBearerType;
-        CApItemCdmaData*    iCdmaData;  // Owned. If NULL, CDMA is unsupported.
-        CApItemWlanData*    iWlanData;  // Owned. If NULL, Wlan is unsupported.
-        HBufC*              iLanBearerModemName;
-        HBufC*              iIapBearerType;
-        TUint32             iIapBearerID;
-        TInt                iBearerProtocol;
-        TInt                iBearerSpeed;
-
-        /**
-        * Indicates if CSD Access point is supported or not.
-        */
-        TBool               iIsAppCsdSupport;      
-        
-        /**
-        * Indicates if HSCSD Access point is supported or not.
-        */
-        TBool               iIsAppHscsdSupport;              
-
-        
-    };
-
-#endif      // CAPITEMEXTRA_H
-
-// End of File
--- a/apengine/apeng/inc/APItemWlanData.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,73 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of class CApItemWlanData 
-*
-*/
-
-
-#ifndef CAPITEMWLANDATA_H
-#define CAPITEMWLANDATA_H
-
-
-//  INCLUDES
-#include <e32base.h>
-
-
-
-// CLASS DECLARATION
-
-/**
-* Wlan-specific data extension for CApAccessPointItem.
-* Access Point data which is common to all AP-s (ISP...), are not stored
-* here.
-*/
-class CApItemWlanData : public CBase
-    {
-    public:
-        /**
-        * Two-phased constructor. Leaves on failure
-        * @return The constructed CApItemWlanData.
-        */
-        static CApItemWlanData* NewL();
-
-        /**
-        * Destructor.
-        */
-        virtual ~CApItemWlanData();
-
-        /**
-        * C++ default constructor.
-        */
-        CApItemWlanData();
-
-        /**
-        * Second-phase constructor.
-        */
-        void ConstructL();
-
-    public:
-        // data members are public for CApAccessPointItem...
-        HBufC* iWlanNetworkName;    ///< WLAN netwotk name, SSID
-        TUint32 iWlanNetworkMode;   ///< Gives network mode, TUint32
-        TUint32 iWlanSecurityMode;  ///< The security mode, TUint32
-        TUint32 iWlanId;            ///< Commdb_id of wlan settings, TUint32
-        TBool   iIsWlan;            ///< Indicates that this WLAN-capable 
-                                    ///< access point is really WLAN or not.
-        TBool   iScanSSID;          ///< need to scan the SSID
-        TUint32 iChannelId;         ///< The ad-hoc channel ID
-    };
-
-#endif      // CAPITEMWLANDATA_H
-
-// End of File
--- a/apengine/apeng/inc/ActiveApDbNotifier.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,93 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declares the CActiveApDbNotifier class.
-*
-*/
-
-
-#ifndef ACTIVE_AP_DB_NOTIFIER_H
-#define ACTIVE_AP_DB_NOTIFIER_H
-
-//  INCLUDES
-
-#include <e32base.h>
-#include <ApEngineVer.h>
-
-
-// FORWARD DECLARATIONS
-
-class CActiveApDb;
-
-// CLASS DECLARATION
-
-/**
-* Active object encapsulating an access point database notifier.
-* Used by CActiveApDb.
-*/
-class CActiveApDbNotifier : public CActive
-    {
-    public:     // construct / destruct
-
-        /**
-        * Constructor.
-        * @param aDb Active access point database to watch for.
-        */
-        CActiveApDbNotifier( CActiveApDb& aDb );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CActiveApDbNotifier();
-
-    protected:  // from CActive
-        /**
-        * Invoked when the outstanding request completes.
-        */
-        void RunL() ;
-
-        /**
-        * Implementation of the Cancel protocol;
-        * cancel any outstanding request.
-        */
-        void DoCancel();
-
-    public:     // new methods
-
-        /**
-        * Start the notifier. The notification request is automatically
-        * renewed until it is cancelled, or the database is closed by
-        * all clients (i.e. released by DBMS).
-        */
-        void Start();
-
-        /**
-        * Cancel and close the notifier now.
-        */
-        void Stop();
-
-    private:
-        /**
-        * Request database change notification from the Access Point Engine.
-        */
-        void NotifyChange();
-
-    private:    // data
-        CActiveApDb* iActiveDb;     ///< Pointer to the database.
-                                    ///< Does not owns it.
-    };
-
-#endif
-
-// End of File
--- a/apengine/apeng/inc/ApEngineCommons.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,309 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of some common global functions.
-*
-*/
-
-
-#ifndef APENGINE_COMMONS_H
-#define APENGINE_COMMONS_H
-
-//  INCLUDES
-#include <commdb.h>
-#include <ApEngineVer.h>
-
-
-// CONSTANTS
-_LIT(KSqlSelectBase, "SELECT * from %s WHERE %s='%S'");
-_LIT( KEmpty, "" );
-_LIT( KFormat, "%S" );
-_LIT8( KFormat8,"%S" );
-
-
-LOCAL_C const TInt KR_ApEngineDefaultValue    = 0;
-
-// DATA TYPES
-
-enum TApEnginePanicCodes
-    {
-    ENullPointer,
-    EInvalidDbType,
-    EWrongResourceFormat,
-    EActiveApDbObserverNotFound,
-    EInvalidColumn,
-    EInvalidSpeed,
-    ESqlError,
-    ESanityCheckFailed,
-    ENotSupported,
-    EMenuCommandUnknown
-    };
-
-
-// CLASS DECLARATION
-/**
-* ApCommons is a collection of commonly used 'utility' functions.
-*/
-NONSHARABLE_CLASS( ApCommons )
-    {
-    public:
-        /**
-        * Panics.
-        */
-        static void Panic( TApEnginePanicCodes aPanic );
-
-        /**
-        * Starts a transaction on the given database if not already in one.
-        * In case of error, leaves with CommDb error codes.
-        * In case of KErrLocked, if retry is asked, it retries the operation
-        * after a short ( KRetryWait ) period. If still locked, leaves with it
-        * to allow caller module to handle the situation
-        * (e.g. giving up a Retry/Cancel query).
-        * In case of successfull transaction starting, pushes
-        * RollbackTransactionOnLeave to the CleanUpStack.
-        * @param aDb A reference to a CCommsDatabase object to start
-        * the transaction.
-        * @param aRetry A TBool indicating whether it shall retry
-        * the operation or not.
-        * @return Boolean indicating whether it has started a
-        * transaction or not (it also means whether it has pushed it or not.)
-        * It is used after DB operations to decide whether we have to
-        * commit or it is the caller's task.
-        */
-        static TBool StartPushedTransactionLC( CCommsDatabase& aDb,
-                                               TBool aRetry = ETrue );
-
-
-        /**
-        * Rolls back transaction on leave; called in leave processing.
-        * @param aDb The database (CCommsDatabase*) as TAny*.
-        */
-        static void RollbackTransactionOnLeave( TAny* aDb );
-
-
-
-
-        /**
-        * Creates a valid name from the passed aName.
-        * @param aDb A reference to a CCommsDatabase object 
-        * @param aChanged A reference to a boolean to hold whether the name 
-        *   had been changed or not.
-        * @param aUid The Uid of the access point whose name we are checking
-        *   to be able to handle updates and ignore self-match only situation
-        * @param aIsNew a boolean specifying whether tha access point whose 
-        *   name we are checking is new or not.
-        * @return A valid name
-        */
-        static HBufC* DoMakeValidNameL( CCommsDatabase& aDb,
-                                        TBool& aChanged,
-                                        HBufC* aName,
-                                        TUint32 aUid,
-                                        TBool aIsNew );
-
-        /**
-        * Ensures that the passed name is valid, length > 0 & length < max.
-        * If length == 0, leaves with KErrInvalidName
-        * If name is only whitespace, leaves with KErrInvalidName
-        * If name is longer than max, name is truncated
-        * It copies the name, pushez it onto the CleanupStack and passes
-        * ownership.
-        * @param aName The name
-        * @param aChanged A reference to a boolean to hold whether the name 
-        *   had been changed or not.        
-        * @return The valid-length name
-        */
-        static HBufC* EnsureMaxLengthLC( const TDesC* aName, TBool& aChanged );
-
-
-
-
-
-
-        /**
-        * If aName is constructed from aPrefix with a postfix, get the numeric
-        * value of the postfix, e.g:
-        *   - GetPostfix( "Foo (3)", "Foo" ) == 3
-        *   - GetPostfix( "Foo 23 (45)", "Foo 23" ) == 45
-        * If aName is the same as aPrefix, return 0, e.g.:
-        *   - GetPostfix( "Foo", "Foo" ) == 0
-        * If aName is not constructed from aPrefix, return -1, e.g.:
-        *   - GetPostfix( "Foobar", "Foo" ) == -1
-        *   - GetPostfix( "Fo 23 45", "Foo" ) == -1
-        * @param aName  The name to get the postfix from
-        * @param aPrefix The prefix
-        * @return The postfix
-        */
-        static TInt GetPostfix( const TDesC& aName, const TDesC& aPrefix );
-
-
-        /**
-        * Given aName in the format <prefix> or
-        * <prefix><brace><integer><brace>, return a
-        * pointer to the leading part. That is, if there is
-        * trailing <space><integer>, then that is excluded;
-        * if there is no trailing part, then the original
-        * decriptor is returned.
-        * Examples:
-        *   - "Foo" returns "Foo";
-        *   - "Foo 12" returns "Foo 12";
-        *   - "Foo(12)" returns "Foo";
-        *   - "Foo 12 (34)" returns "Foo 12 ";
-        *   - "Foo bar" returns "Foo bar";
-        *   - "Foo " returns "Foo ".
-        * @param aName  The name to get the prefix from
-        * @return The prefix
-        */
-        static TPtrC GetPrefix( const TDesC& aName );
-
-
-        /**
-        * Reads up a TUint32 from the given tables given column.
-        * Leaves in case of error.
-        * Leave with KErrUnknown is captured and returned as
-        * function return value.
-        * The main aim is not to Leave if some value is not written to the DB.
-        * @param atable The table to read from
-        * @param aColumn The column to read
-        * @param aValue A reference to hold the readed integer
-        * @return Error code
-        */
-        static TInt ReadUintL
-                        (
-                        CCommsDbTableView* atable,
-                        const TDesC& aColumn,
-                        TUint32& aValue
-                        );
-
-        /**
-        * Reads up a TBool from the given tables given column.
-        * Leaves in case of error.
-        * Leave with KErrUnknown is captured and returned as
-        * function return value.
-        * The main aim is not to Leave if some value is not written to the DB.
-        * @param atable The table to read from
-        * @param aColumn The column to read
-        * @param aValue A reference to hold the readed boolean
-        * @return Error code
-        */
-        static TInt ReadBoolL
-                        (
-                        CCommsDbTableView* atable,
-                        const TDesC& aColumn,
-                        TBool& aValue
-                        );
-
-
-        /**
-        * Reads up a long text from the given tables given column.
-        * Leaves in case of error.
-        * Leave with KErrUnknown is captured and returned as
-        * function return value.
-        * Ownership of the returned text is passed to the caller.
-        * The main aim is not to Leave if some value is not written to the DB.
-        * @param atable The table to read from
-        * @param aColumn The column to read
-        * @param aValue A reference to hold the error code
-        * @return The readed long text
-        */
-        static HBufC* ReadLongTextLC
-                        (
-                        CCommsDbTableView* atable,
-                        const TDesC& aColumn,
-                        TInt& aErrCode
-                        );
-                        
-
-        /**
-        * Reads up a long text from the given tables given column.
-        * Leaves in case of error.
-        * Ownership of the returned text is passed to the caller.
-        * Readed data is poped from the CleanuptStack to be able
-        * to TRAP it in ReadLongTextLC (above) function...
-        * @param atable The table to read from
-        * @param aColumn The column to read
-        * @return The readed long text
-        */
-        static HBufC* ReadLongTextL( CCommsDbTableView* atable,
-                                     const TDesC& aColumn );
-
-
-        /**
-        * Returns the escaped aLiteral.
-        * @param aLiteral The lietral to be escaped
-        * @return the escaped aLiteral.
-        */
-        static HBufC* EscapeTextLC( const TDesC& aLiteral );
-
-
-        /**
-        * Reads up the specified text columns value from the database.
-        * In case of error, leaves with CommDb error codes.
-        */
-        static HBufC16* ReadText16ValueLC( CCommsDbTableView* atable,
-                                           const TDesC& aCol );
-
-        /**
-        * Reads up the specified text columns value from the database.
-        * In case of error, leaves with CommDb error codes.
-        * @param atable The table to read from
-        * @param aColumn The column to read
-        * @return The readed text
-        */
-        static HBufC8* ReadText8ValueLC( CCommsDbTableView* atable,
-                                         const TDesC& aCol );
-
-        /**
-        * Reads up the read-only flag for the current record
-        * in the passed table
-        * In case of error, leaves with CommDb error codes.
-        * The function expects the passed table to have a valid
-        * current record, that is, after creating the table,
-        * record cursor must be setted to the desired record...
-        * @param aTable The table to read current records read-only flag.
-        * @return The current records read-only flag
-        */
-        static TBool DoGetReadOnlyL( CCommsDbTableView& aTable );
-
-
-        /**
-        * Commits a transaction on the given database.
-        * In case of error, returns the CommDb error codes.
-        * @param aDb The database to commit the transaction on
-        * @return Error code
-        */
-        static TInt CommitTransaction( CCommsDatabase& aDb );
-
-
-        /**
-        * Gets the local variant value 
-        * @return A TInt stating the variant
-        */
-        static TInt GetVariantL();
-
-
-        /**
-        * Gives back the TInt Value of the given shared data key for the given 
-        * UId. Does't use notify the given shared data, just gives back the
-        * actual value.
-        * @param aUid actual uid to identify the chunk of shared data
-        * @param aKey actual shared data key
-        * @return The actual value of the shared data
-        */
-        static TInt IsGivenSharedDataSupportL( const TUid aUid, 
-                                               const TUint32 aKey );
-
-    };
-
-#endif      // CAPENGINE_COMMONS_H
-
-// End of File
--- a/apengine/apeng/inc/ApEngineLogger.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,153 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*      Logging macros for Access Point Engine
-*      
-*
-*/
-
-
-#ifndef APENGINE_LOGGER_H
-#define APENGINE_LOGGER_H
-
-// INCLUDES
-
-#ifdef __TEST_APENGINE_LOG__
-    #include <e32std.h>
-    #include <e32def.h>
-    #include <flogger.h>
-
-    // TYPES
-
-    enum TApEngineLogMask             ///< Log mask bits.
-        {
-        ELogOff         = 0x00000000,   ///< Don't log.
-        ETransaction    = 0x00000001,   ///< Log transaction activity.
-        ESelect         = 0x00000002,   ///< Log ApSelect activity.
-        EHandler        = 0x00000004,   ///< Log ApDataHandler activity.
-        EUtil           = 0x00000008,   ///< Log ApUtils activity.
-        ENetworks       = 0x0000000F,   ///< Log Networks activity.
-        EApList         = 0x00000010,   ///< Log ApList activity.
-        EProtection     = 0x00000020,   ///< Log protection activity.
-        EApItem         = 0x00000040,   ///< Log ApItem activity.
-        ECommons        = 0x00000080,   ///< Log transaction activity.
-        EActiveDb       = 0x000000F0,   ///< Log active db & notification 
-                                        ///< activity.
-
-        ESpecial        = 0x0FFFF000,   ///< Log special, temp stuff only
-        ELogAll         = 0xFFFFFFFF    ///< Log all.
-        };
-
-    // MACROS
-
-    /// Determines what to log. Construct this from TApEngineLogMask values.
-    #define APENGINE_LOG_MASK ELogAll
-
-    /// Determines log detail (0==basic level).
-    #define APENGINE_LOG_LEVEL 4
-
-    // CLASS DECLARATION
-
-    /**
-    * Logger class.
-    */
-    NONSHARABLE_CLASS( ApEngineLogger )
-        {
-        public:     // new methods
-
-        /**
-        * Write formatted log.
-        * @param aMask Log mask.
-        * @param aLevel Log level.
-        * @param aFmt Format string.
-        */
-        static void Write
-            ( TInt32 aMask, TInt aLevel, 
-              TRefByValue<const TDesC16> aFmt, ... );
-
-        /**
-        * Write formatted log.
-        * @param aMask Log mask.
-        * @param aLevel Log level.
-        * @param aFmt Format string.
-        * @param aList Variable argument list.
-        */
-        static void Write
-            (
-            TInt32 aMask,
-            TInt aLevel,
-            TRefByValue<const TDesC16> aFmt,
-            VA_LIST& aList
-            );
-
-        /**
-        * Write formatted log.
-        * @param aMask Log mask.
-        * @param aLevel Log level.
-        * @param aFmt Format string.
-        */
-        static void Write
-            ( TInt32 aMask, TInt aLevel, TRefByValue<const TDesC8> aFmt, ... );
-
-        /**
-        * Write formatted log.
-        * @param aMask Log mask.
-        * @param aLevel Log level.
-        * @param aFmt Format string.
-        * @param aList Variable argument list.
-        */
-        static void Write
-            (
-            TInt32 aMask,
-            TInt aLevel,
-            TRefByValue<const TDesC8> aFmt,
-            VA_LIST& aList
-            );
-
-        /**
-        * Write hex dump.
-        * @param aMask Log mask.
-        * @param aLevel Log level.
-        * @param aHeader Header string.
-        * @param aMargin Margin.
-        * @param aPtr Data.
-        * @param aLen Data length.
-        */
-        static void HexDump
-            (
-            TInt32 aMask,
-            TInt aLevel, 
-            const TText* aHeader,
-            const TText* aMargin,
-            const TUint8* aPtr,
-            TInt aLen
-            );
-        };
-
-
-    /// Write formatted to log.
-    #define CLOG( body ) ApEngineLogger::Write body
-    /// Write hex dump.
-    #define CDUMP( body ) ApEngineLogger::HexDump body
-
-#else /* not defined __TEST_APENGINE_LOG__ */
-
-    /// Do nothing (log disabled).
-    #define CLOG( body )
-    /// Do nothing (log disabled).
-    #define CDUMP( body )
-
-#endif /* def __TEST_APENGINE_LOG__ */
-
-#endif /* def APENGINE_LOGGER_H */
--- a/apengine/apeng/inc/ApEnginePrivateCRKeys.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#ifndef APENGINEPRIVATECRKEYS_H
-#define APENGINEPRIVATECRKEYS_H
-
-const TUid KCRUidApEngineLV = {0x10008D3A};
-
-// Local variation for ApEngine
-const TUint32 KApEngineLVFlags =            0x00000001;
-
-
-#endif      // APENGINEPRIVATECRKEYS_H
\ No newline at end of file
--- a/apengine/apeng/inc/ApListItemKey.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,92 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the TApListItemKey class.
-*
-*/
-
-
-#ifndef TAPLISTITEMKEY_H
-#define TAPLISTITEMKEY_H
-
-//  INCLUDES
-#include <e32base.h>
-#include <e32std.h>
-#include <ApEngineVer.h>
-
-// CLASS DECLARATION
-/**
-*  A key for sorting CApListItems according to their name
-*  The pointer to the list is not owned
-*/
-NONSHARABLE_CLASS( TApListItemNameKey ) : public TKeyArrayFix
-    {
-public:
-    /**
-    * Sets the list to sort
-    * @param aPtr A pointer to the l;ist to sort
-    */
-    void SetPtr( CApListItemList* aPtr );
-    
-    // From TKeyArrayFix
-    virtual TInt Compare( TInt aLeft,TInt aRight ) const;
-    
-    // From TKeyArrayFix
-    virtual TAny* At( TInt anIndex ) const;
-    
-    /**
-    * Constructor
-    */
-    TApListItemNameKey( TBool aAscending = ETrue );
-    
-protected:
-    CApListItemList* iList;
-    TBool            iAscending;
-    };
-
-
-
-
-/**
-*  A key for sorting CApListItems according to their UID
-*  The pointer to the list is not owned
-*/
-NONSHARABLE_CLASS( TApListItemUidKey ) : public TKeyArrayFix
-    {
-public:
-    /**
-    * Sets the list to sort
-    * @param aPtr A pointer to the l;ist to sort
-    */
-    void SetPtr( CApListItemList* aPtr );
-        
-    // From TKeyArrayFix
-    virtual TInt Compare( TInt aLeft,TInt aRight ) const;
-    
-    // From TKeyArrayFix
-    virtual TAny* At( TInt anIndex ) const;
-    
-    /**
-    * Constructor
-    */
-    TApListItemUidKey( TBool aAscending = ETrue );
-
-    
-protected:
-    CApListItemList* iList;
-    TBool            iAscending;
-    };
-
-#endif
-
-// End of File
--- a/apengine/apeng/inc/ApSpeedLookup.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,129 +0,0 @@
-/*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*       This file containes the Access Point Engine speed - ETel speed 
-*       lookup-information for the Access Point Engine 
-*
-*/
-
-
-
-#ifndef APSPEED_LOOKUP_H
-#define APSPEED_LOOKUP_H
-
-// INCLUDE FILES
-#include <ApEngineConsts.h>
-
-
-// CONSTANTS
-
-const TInt  CSD     = 0;
-const TInt  HSCSD   = 1;
-
-const TInt  Analogue    = 0;
-const TInt  V110        = 1;
-const TInt  V120        = 2;
-
-
-const TInt SpeedData[27][13] =
-    {
-        {
-        CSD,  Analogue,  KSpeedAutobaud,  0,  1,  2,  0,  0,  0,  0,  0,  1,  0
-        },
-        {
-        CSD,  Analogue,  KSpeed9600,      0,  4,  2,  0,  0,  0,  0,  0,  1,  2
-        },
-        {
-        CSD,  Analogue,  KSpeed14400,     0,  5,  2,  0,  0,  0,  0,  0,  1,  3
-        },        
-        {
-        CSD,  Analogue,  KSpeed28800,     0,  7,  2,  0,  0,  0,  0,  0,  1,  3
-        },
-        {
-        CSD,  V110,  KSpeed9600,      0,  4,  2,  0,  0,  0,  0,  0,  1,  4
-        },
-        {
-        CSD,  V110,  KSpeed14400,     0,  5,  2,  0,  0,  0,  0,  0,  1,  4
-        },        
-        {
-        CSD,  V110,  KSpeed28800,     0,  7,  2,  0,  0,  0,  0,  0,  1,  4
-        },
-        {
-        CSD,  V110,  KSpeed38400,     0, 10,  2,  0,  0,  0,  0,  0,  1,  4
-        },
-        {
-        CSD,  V120,  KSpeed9600,      0,  4,  2,  0,  0,  0,  0,  0,  1,  5
-        },
-        {
-        CSD,  V120,  KSpeed14400,     0,  5,  2,  0,  0,  0,  0,  0,  1,  5
-        },        
-        {
-        CSD,  V120,  KSpeed28800,     0,  7,  2,  0,  0,  0,  0,  0,  1,  5
-        },
-        {
-        CSD,  V120,  KSpeed56000,     0, 13,  2,  0,  0,  0,  0,  0,  1,  5
-        },
-        {
-        HSCSD, Analogue, KSpeedAutobaud,  1,  7,  2,  1, 12,  0,  0,  2,  1,  3
-        },
-        {
-        HSCSD, Analogue, KSpeed9600,      1,  7,  2,  1,  4,  0,  1,  1,  1,  3
-        },
-        {
-        HSCSD, Analogue, KSpeed14400,     1,  7,  2,  1, 12,  0,  1,  1,  1,  3
-        },        
-        {
-        HSCSD, Analogue, KSpeed19200,     1,  7,  2,  1,  4,  0,  2,  2,  1,  3
-        },
-        {
-        HSCSD, Analogue, KSpeed28800,     1,  7,  2,  1, 12,  0,  2,  2,  1,  3
-        },
-        {
-        HSCSD, V110, KSpeed9600,      1, 10,  2,  1,  4,  0,  1,  1,  1,  4
-        },
-        {
-        HSCSD, V110, KSpeed14400,     1, 10,  2,  1, 12,  0,  1,  1,  1,  4
-        },        
-        {
-        HSCSD, V110, KSpeed19200,     1, 10,  2,  1,  4,  0,  2,  2,  1,  4
-        },
-        {
-        HSCSD, V110, KSpeed28800,     1, 10,  2,  1, 12,  0,  2,  2,  1,  4
-        },
-        {
-        HSCSD, V110, KSpeed38400,     1, 10,  2,  1, 12,  0,  3,  3,  1,  4
-        },
-        {
-        HSCSD, V120, KSpeed9600,      1, 13,  2,  1,  4,  0,  1,  1,  1,  5
-        },
-        {
-        HSCSD, V120, KSpeed14400,     1, 13,  2,  1, 12,  0,  1,  1,  1,  5
-        },        
-        {
-        HSCSD, V120, KSpeed19200,     1, 13,  2,  1,  4,  0,  2,  2,  1,  5
-        },        
-        {
-        HSCSD, V120, KSpeed28800,     1, 13,  2,  1, 12,  0,  2,  2,  1,  5
-        },
-        {
-        HSCSD, V120, KSpeed43200,     1, 13,  2,  1, 12,  0,  3,  3,  1,  5
-        }
-    };
-        
-
-
-
-#endif
-
-// End of File
--- a/apengine/apeng/loc/apengine.loc	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,41 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     This is a localisation file for ApEngine
-*     A .loc file is the one and only place where the logical strings
-*     to be localised are defined.
-*
-*/
-
-
-
-// LOCALISATION STRINGS
-
-
-//d:The name of a new, default connection. Max.30 chars, longer ones will be truncated.
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_ap_default_name "New connection"
-
-
-//d:The name of a new, default vpn connection. Max.30 chars, longer ones will be truncated.
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_vpn_sett_vpn_iap_default_name "Connection"
-
-// End of File
--- a/apengine/apeng/src/APAccessPointItem.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1071 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the class CApAccessPointItem
-*
-*/
-
-
-// INCLUDE FILES
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <nifvar_internal.h>
-#endif
-#include    <cdblen.h>
-#include    <f32file.h>
-#include    <bautils.h>
-#include    <barsc.h>
-#include    <apengine.rsg>
-#include    "ApAccessPointItem.h"
-#include    "ApEngineConsts.h"
-#include    "ApEngineCommons.h"
-#include    "ApEngineLogger.h"
-#include    <txtetext.h>
-#include    <in_sock.h>
-
-#include    "APItemExtra.h"
-#include    "APItemCdmaData.h"
-#include    "APItemWlanData.h"
-
-#include    <featmgr.h>
-#include    <etelpckt.h>
-#include    <etelqos.h>
-
-#include    <data_caging_path_literals.hrh>
-
-
-// EXTERNAL FUNCTION PROTOTYPES
-
-// CONSTANTS
-_LIT( KDefIspIfName, "ppp" );                           // required !
-
-_LIT( KDefGprsIfName, "pppgprs" );                      // required !
-
-_LIT( KDefIspIfNetworksIPv4, "ip" );                        // required !
-//_LIT( KDefGprsIfParams, "gprsnif" );                    // required !
-_LIT( KDefGprsIfParams, "" );                    // required !
-
-_LIT( KDefWapGatewayIpAddress, "0.0.0.0" );
-_LIT( KDefIspGateway, "0.0.0.0" );
-_LIT( KDefPhoneIpAddress, "0.0.0.0" );
-_LIT( KDefPrimaryNameServer, "0.0.0.0" );
-_LIT( KDefSecondaryNameServer, "0.0.0.0" );
-
-_LIT( KWellKnownIp6PrimaryNameServer, "fec0:000:0000:ffff::1" );
-_LIT( KWellKnownIp6SecondaryNameServer, "fec0:000:0000:ffff::2" );
-_LIT( KDefIp6PrimaryNameServer, "0:0:0:0:0:0:0:0" );
-_LIT( KDefIp6SecondaryNameServer, "0:0:0:0:0:0:0:0" );
-
-_LIT( KDefIspIfNetworksIPv6, "ip6" );                        // required !
-_LIT( KDefIspIfNetworksIPv4IPv6, "ip,ip6" );                 // required !
-_LIT( KDefIspIfNetworksIPv4IPv6LAN, "ip,ip6" );              // required !
-
-
-
-/// ROM drive.
-_LIT( KApEngineResDriveZ, "z:" );
-/// ApEngine resource file name.
-_LIT( KApEngineResFileName, "ApEngine.rsc" );
-
-
-/**
-* General Settings UID
-*/
-#ifdef __TEST_USE_SHARED_DATA
-    LOCAL_D const TUid KGeneralSettingsUid = { 0X100058EC };
-#endif // __TEST_USE_SHARED_DATA
-
-
-// MACROS
-#define BOOL_COMPARE(a,b) (((a) && (b)) || (!(a) && !(b)))
-
-// LOCAL CONSTANTS AND MACROS
-const TInt KApItemInitialTxtBufSize = 0;
-
-const TInt KApMembers = EApWlanIPNameServer2+1;
-
-_LIT( KDefProxyProtocolName, "http" );                      // required !
-
-#if defined(_DEBUG)
-    _LIT( kApSet, "APEngine" ) ;
-#endif // (_DEBUG)
-
-const TInt KEndOfArray = -1;
-
-const TInt KCsdAnalogue[]       = { KSpeedAutobaud, KSpeed9600, KSpeed14400,
-                                    KEndOfArray };
-
-const TInt KCsdAnalogueWcdma[]  = { KSpeedAutobaud, KSpeed9600, KSpeed14400,
-                                    KSpeed28800, KEndOfArray};
-
-const TInt KCsdIsdn110[]        = { KSpeed9600, KSpeed14400, KEndOfArray};
-
-const TInt KCsdIsdn110Wcdma[]   = { KSpeed9600, KSpeed14400, KSpeed28800,
-                                    KSpeed38400, KEndOfArray};
-
-const TInt KCsdIsdn120[]        = { KSpeed9600, KSpeed14400, KEndOfArray};
-
-const TInt KCsdIsdn120Wcdma[]   = { KSpeed9600, KSpeed14400, KSpeed28800,
-                                    KSpeed56000, KEndOfArray};
-
-const TInt KHcsdAnal[]          = { KSpeedAutobaud, KSpeed9600, KSpeed14400,
-                                    KSpeed19200, KSpeed28800, KEndOfArray};
-
-const TInt KHcsdIsdn110[]       = { KSpeed9600, KSpeed14400, KSpeed19200, 
-                                    KSpeed28800, KSpeed38400, KEndOfArray};
-
-const TInt KHcsdIsdn120[]       = { KSpeed9600, KSpeed14400, KSpeed19200,
-                                    KSpeed28800, KSpeed43200, KEndOfArray};
-
-
-
-// ---------------------------------------------------------
-// ---------------------------------------------------------
-// 
-//  LOCAL, CApItemExtra class implementation
-// 
-// ---------------------------------------------------------
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-// CApItemExtra::NewL
-// ---------------------------------------------------------
-//
-CApItemExtra* CApItemExtra::NewL()
-    {
-    return NULL;
-    }
-
-
-// Destructor
-// ---------------------------------------------------------
-// CApItemExtra::~CApItemExtra
-// ---------------------------------------------------------
-//
-CApItemExtra::~CApItemExtra()
-    {
-    }
-
-
-// C++ default constructor can NOT contain any code that
-// might leave.
-// ---------------------------------------------------------
-// CApItemExtra::CApItemExtra
-// ---------------------------------------------------------
-//
-CApItemExtra::CApItemExtra()
-:iIsFeatureManagerInitialised( EFalse ),
-iIpv6GetDNSIPFromServer( ETrue ),
-iIsWcdma( EFalse ), 
-iIsIpv6Supported( EFalse ),
-iIsVpnAp( EFalse ),
-iIsAppCsdSupport( EFalse )
-    {
-    }
-
-// Symbian OS default constructor can leave.
-// ---------------------------------------------------------
-// CApItemExtra::ConstructL
-// ---------------------------------------------------------
-//
-void CApItemExtra::ConstructL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// ---------------------------------------------------------
-// 
-//  LOCAL, CApItemCdmaData class implementation
-// 
-// ---------------------------------------------------------
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-// CApItemCdmaData::NewL
-// ---------------------------------------------------------
-//
-CApItemCdmaData* CApItemCdmaData::NewL()
-    {
-    return NULL;
-    }
-
-
-// Destructor
-// ---------------------------------------------------------
-// CApItemCdmaData::~CApItemCdmaData
-// ---------------------------------------------------------
-//
-CApItemCdmaData::~CApItemCdmaData()
-    {
-    }
-
-
-// C++ default constructor can NOT contain any code that
-// might leave.
-// ---------------------------------------------------------
-// CApItemCdmaData::CApItemCdmaData
-// ---------------------------------------------------------
-//
-CApItemCdmaData::CApItemCdmaData()
-/* Assuming 0 default values everywhere. */
-:iServiceOption( RPacketContext::KLowSpeedData ),
-iPdpType( EIPv4 ),
-iReqFwdPriority( 0 ), /*RPacketQoS::TQoSLinkPriority*/
-iReqRevPriority( 0 ), /*RPacketQoS::TQoSLinkPriority*/
-iReqFwdBitrate( 0 ),  /*RPacketQoS::TQoSDataRate*/
-iReqRevBitrate( 0 ),  /*RPacketQoS::TQoSDataRate*/
-iReqFwdLoss( 0 ),  /*RPacketQoS::TQoSDataLoss*/
-iReqRevLoss( 0 ),  /*RPacketQoS::TQoSDataLoss*/
-iReqFwdMaxDelay( 0 ),  /*RPacketQoS::TQoSDelay*/
-iReqRevMaxDelay( 0 ),  /*RPacketQoS::TQoSDelay*/
-iMinFwdBitrate( 0 ),  /*RPacketQoS::TQoSDataRate*/
-iMinRevBitrate( 0 ),  /*RPacketQoS::TQoSDataRate*/
-iAccptFwdLoss( 0 ),  /*RPacketQoS::TQoSDataLoss*/
-iAccptRevLoss( 0 ),  /*RPacketQoS::TQoSDataLoss*/
-iAccptFwdMaxDelay( 0 ),  /*RPacketQoS::TQoSDelay*/
-iAccptRevMaxDelay( 0 ),  /*RPacketQoS::TQoSDelay*/
-iQosWarningTimeout( 0 ), /*0xffffffff disables*/
-iRlpMode( RPacketQoS::KRLPUnknown ),
-// CDMA2000 deprecated Mobile IP fields
-iMip( EFalse ),
-iMipTimeout( 0 ),
-// CDMA2000 specific CDMA parameters provisioned through OTA
-iNaiType( 0 ),
-iSimpleIpAuthAlgorithm( 0 ),
-iSimpleIpPapSsHandle( 0 ),
-iSimpleIpChapSsHandle( 0 ),
-iMipTBit( 0 ),
-iMipMnAaaAuthAlgorithm( 0 ),
-iMipMnAaaSpi( 0 ),
-iMipMnAaaSsHandle( 0 ),
-iMipMnHaAuthAlgorithm( 0 ),
-iMipMnHaSpi( 0 ),
-iMipMnHaSsHandle( 0 )
-    {
-    }
-
-// Symbian OS default constructor can leave.
-// ---------------------------------------------------------
-// CApItemCdmaData::ConstructL
-// ---------------------------------------------------------
-//
-void CApItemCdmaData::ConstructL()
-    {
-    }
-
-
-
-
-
-
-
-// ---------------------------------------------------------
-// ---------------------------------------------------------
-// 
-//  LOCAL, CApItemWlanData class implementation
-// 
-// ---------------------------------------------------------
-// ---------------------------------------------------------
-//
-// ---------------------------------------------------------
-// CApItemWlanData::NewL
-// ---------------------------------------------------------
-//
-CApItemWlanData* CApItemWlanData::NewL()
-    {
-    return NULL;
-    }
-
-
-// Destructor
-// ---------------------------------------------------------
-// CApItemWlanData::~CApItemWlanData
-// ---------------------------------------------------------
-//
-CApItemWlanData::~CApItemWlanData()
-    {
-    }
-
-
-// C++ default constructor can NOT contain any code that
-// might leave.
-// ---------------------------------------------------------
-// CApItemWlanData::CApItemWlanData
-// ---------------------------------------------------------
-//
-CApItemWlanData::CApItemWlanData()
-:iWlanNetworkMode( EInfra ),
-iWlanSecurityMode( EOpen )
-/* Assuming 0 default values elsewhere. */
-    {
-    }
-
-// Symbian OS default constructor can leave.
-// ---------------------------------------------------------
-// CApItemWlanData::ConstructL
-// ---------------------------------------------------------
-//
-void CApItemWlanData::ConstructL()
-    {
-    }
-
-
-
-
-// MODULE DATA STRUCTURES
-
-// =========================================================
-// =========================================================
-// =========================================================
-// 
-// CApAccessPointItem class implementation
-// 
-// =========================================================
-// =========================================================
-// =========================================================
-//
-
-// ================= MEMBER FUNCTIONS =======================
-// Two-phased constructor.
-// ---------------------------------------------------------
-// CApAccessPointItem::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApAccessPointItem* CApAccessPointItem::NewLC()
-    {
-    return NULL;
-    }
-
-
-// Destructor
-// ---------------------------------------------------------
-// CApAccessPointItem::~CApAccessPointItem
-// ---------------------------------------------------------
-//
-EXPORT_C CApAccessPointItem::~CApAccessPointItem()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::CopyFromL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApAccessPointItem::CopyFromL( const CApAccessPointItem&
-                                            aCopyFrom  )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::operator==
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApAccessPointItem::operator==(
-                                             const CApAccessPointItem& aItem
-                                             ) const
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::operator!=
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApAccessPointItem::operator!=(
-                                             const CApAccessPointItem& aItem
-                                             ) const
-    {
-    return EFalse;
-    }
-
-
-
-// C++ default constructor can NOT contain any code that
-// might leave.
-// ---------------------------------------------------------
-// CApAccessPointItem::CApAccessPointItem
-// ---------------------------------------------------------
-//
-EXPORT_C CApAccessPointItem::CApAccessPointItem()
-:iIsWTLSSecurityOn( EFalse ),
-iIsConnectionTypeContinuous( EWapWspOptionConnectionOriented ),
-iIspType( EIspTypeInternetOnly ),
-iUseLoginScript( EFalse ),
-iPromptPassword( EFalse ),
-iDisplayTerminalWindow( EFalse ),
-iUseCallBack( EFalse ),
-iCallBackTypeIsServerNum( ECallbackActionMSCBCPAcceptServerSpecifiedNumber ),
-iIspCallbackTimeOut( KCallBackTimeOut ),
-iEnablePPPCompression( EFalse ),
-iIsPasswordAuthenticationSecure( ETrue ),
-iBearerCallTypeIsdn( ECallTypeAnalogue ),
-iIspBearerCE( RMobileCall::EQoSNonTransparent ),
-iGprsPdpType( EIPv4 ),
-iIsReadOnly( EFalse ),
-iApHasProxySettings( EFalse ),
-iNetworkId( 0 ),
-iApIapBearerService( RMobileCall::KCapsDataCircuitAsynchronous )
-
-    {
-    }
-
-
-// Symbian OS default constructor can leave.
-// ---------------------------------------------------------
-// CApAccessPointItem::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApAccessPointItem::ConstructL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::ReadTextL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApAccessPointItem::ReadTextL( const TApMember aColumn,
-                                           TDes8& aValue )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::ReadTextL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApAccessPointItem::ReadTextL( const TApMember aColumn,
-                                           TDes16& aValue )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::ReadLongTextL
-// ---------------------------------------------------------
-//
-EXPORT_C HBufC* CApAccessPointItem::ReadLongTextL( const TApMember aColumn )
-    {
-    return NULL;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::ReadConstLongTextL
-// ---------------------------------------------------------
-//
-EXPORT_C const HBufC* CApAccessPointItem::ReadConstLongTextL
-                                            ( const TApMember aColumn )
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::ReadTextLengthL
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CApAccessPointItem::ReadTextLengthL( const TApMember aColumn )
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::ReadUint
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApAccessPointItem::ReadUint( const TApMember aColumn,
-                                           TUint32& aValue )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::ReadBool
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApAccessPointItem::ReadBool( const TApMember aColumn,
-                                           TBool& aValue )
-    {
-    return KErrNotSupported;
-    }
-
-
-// Update
-// ---------------------------------------------------------
-// CApAccessPointItem::WriteTextL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApAccessPointItem::WriteTextL( const TApMember aColumn,
-                                            const TDesC8& aValue )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::WriteTextL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApAccessPointItem::WriteTextL( const TApMember aColumn,
-                                            const TDesC16& aValue )
-    {
-    return KErrNotSupported;
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::WriteLongTextL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApAccessPointItem::WriteLongTextL( const TApMember aColumn,
-                                                const TDesC& aValue )
-    {
-    return KErrNotSupported;
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::WriteUint
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApAccessPointItem::WriteUint( const TApMember aColumn,
-                                            const TUint32& aValue )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::WriteBool
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApAccessPointItem::WriteBool( const TApMember aColumn,
-                                            const TBool& aValue )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// Query
-// COMMON
-
-// ---------------------------------------------------------
-// CApAccessPointItem::Uid
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CApAccessPointItem::WapUid() const
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::ConnectionName
-// ---------------------------------------------------------
-//
-EXPORT_C const TDesC& CApAccessPointItem::ConnectionName() const
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// WAP-spec.
-// ---------------------------------------------------------
-// CApAccessPointItem::WapBearer
-// ---------------------------------------------------------
-//
-EXPORT_C const TDesC& CApAccessPointItem::WapBearer() const
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// WAP-spec.
-// ---------------------------------------------------------
-// CApAccessPointItem::BearerTypeL
-// ---------------------------------------------------------
-//
-EXPORT_C TApBearerType CApAccessPointItem::BearerTypeL()
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SetBearerTypeL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApAccessPointItem::SetBearerTypeL( TApBearerType aBearer )
-    {    
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SetNamesL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApAccessPointItem::SetNamesL( const TDesC16& aValue )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SanityCheckOk
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApAccessPointItem::SanityCheckOk()
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::HasSameIspAndBearer
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApAccessPointItem::HasSameIspAndBearerL(
-                                 CApAccessPointItem& aItem )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::IsReadOnly
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApAccessPointItem::IsReadOnly() const
-    {
-    return EFalse;
-    }
-
-
-
-
-// ================= OTHER EXPORTED FUNCTIONS ==============
-
-
-// =============== OTHER NON - EXPORTED FUNCTIONS ============
-// ---------------------------------------------------------
-// CApAccessPointItem::IsVpnAp
-// ---------------------------------------------------------
-//
-TBool CApAccessPointItem::IsVpnAp() const
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SetVpnAp
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::SetVpnAp( TBool aIsVpn )
-    {
-    }
-
-// ---------------------------------------------------------
-// CApAccessPointItem::Specified
-// ---------------------------------------------------------
-//
-TBool CApAccessPointItem::Specified( TApMember aMember )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::Specify
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::Specify( TApMember aMember, TBool aOn )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SpecifyAll
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::SpecifyAll( TBool aOn )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SpecifyWap
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::SpecifyWap( TBool aOn )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SpecifyIpBearer
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::SpecifyIpBearer( TBool aOn )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SpecifyIAP
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::SpecifyIAP( TBool aOn )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SpecifyISP
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::SpecifyISP( TBool aOn )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SpecifyGPRS
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::SpecifyGPRS( TBool aOn )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SpecifyCDMA
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::SpecifyCDMA( TBool aOn )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SpecifyWLAN
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::SpecifyWLAN( TBool aOn )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SetDnsIpFromServer
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::SetDnsIpFromServer()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SetIpFromServer
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::SetIpFromServer()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SetDns6IpFromServer
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::SetDns6IpFromServer()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::ReAllocL
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::ReAllocL(HBufC8*& aDes, const TDesC8& aValue)
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::ReAllocL
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::ReAllocL(HBufC*& aDes, const TDesC16& aValue)
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::DoCompareApL
-// ---------------------------------------------------------
-//
-TBool CApAccessPointItem::DoCompareApL( const CApAccessPointItem& aItem )const
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::CompareWap
-// ---------------------------------------------------------
-//
-TBool CApAccessPointItem::CompareWap( const CApAccessPointItem& aItem ) const
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::CompareIap
-// ---------------------------------------------------------
-//
-TBool CApAccessPointItem::CompareIap( const CApAccessPointItem& aItem ) const
-    {
-    return EFalse;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::CompareIsp
-// ---------------------------------------------------------
-//
-TBool CApAccessPointItem::CompareIsp( const CApAccessPointItem& aItem ) const
-    {
-    return EFalse;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::CompareGprs
-// ---------------------------------------------------------
-//
-TBool CApAccessPointItem::CompareGprs( const CApAccessPointItem& aItem ) const
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::CompareCdma
-// ---------------------------------------------------------
-//
-TBool CApAccessPointItem::CompareCdma( const CApAccessPointItem& aItem ) const
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::CompareWlan
-// ---------------------------------------------------------
-//
-TBool CApAccessPointItem::CompareWlan( const CApAccessPointItem& aItem ) const
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::GetCleanIpAddressLC
-// ---------------------------------------------------------
-//
-HBufC* CApAccessPointItem::GetCleanIpAddressLC( const TDesC& aValue )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::GetPlainPhoneNumberLC
-// ---------------------------------------------------------
-//
-HBufC* CApAccessPointItem::GetPlainPhoneNumberLC( const TDesC& aNumber )
-    {
-    return NULL;
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::IsSamePhoneNumber
-// ---------------------------------------------------------
-//
-TBool CApAccessPointItem::IsSamePhoneNumberL( CApAccessPointItem& aItem )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::RemoveInvalidPhoneCharsLC
-// ---------------------------------------------------------
-//
-HBufC* CApAccessPointItem::RemoveInvalidPhoneCharsLC( const TDesC16& aInText )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::RemoveInvalidCharsLC
-// ---------------------------------------------------------
-//
-HBufC* CApAccessPointItem::RemoveInvalidCharsLC( const TDesC16& aInText )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::RemoveInvalidCharsLC
-// ---------------------------------------------------------
-//
-HBufC8* CApAccessPointItem::RemoveInvalidCharsLC( const TDesC8& aInText )
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::CompareProxy
-// ---------------------------------------------------------
-//
-TBool CApAccessPointItem::CompareProxy( const CApAccessPointItem& aItem ) const
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::HasProxy
-// ---------------------------------------------------------
-//
-TBool CApAccessPointItem::HasProxy() const
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApAccessPointItem::SetProxyFlag
-// ---------------------------------------------------------
-//
-void CApAccessPointItem::SetProxyFlag()
-    {
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApAccessPointItem::LimitSpeed
-//----------------------------------------------------------
-//
-void CApAccessPointItem::LimitSpeedL()
-    {
-    }
-
-
-
-//----------------------------------------------------------
-// CApAccessPointItem::SetIfNetworksL
-//----------------------------------------------------------
-//
-void CApAccessPointItem::SetIfNetworksL()
-    {
-    }
-
-
-//----------------------------------------------------------
-// CApAccessPointItem::IsSupported
-//----------------------------------------------------------
-//
-TBool CApAccessPointItem::IsSupported( TApMember aColumn )
-    {
-    return EFalse;
-    }
-
-//----------------------------------------------------------
-// CApAccessPointItem::LeaveIfUnsupportedL
-//----------------------------------------------------------
-//
-void CApAccessPointItem::LeaveIfUnsupportedL( TApMember aColumn )
-    {
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApAccessPointItem::IsWlan
-//----------------------------------------------------------
-//
-TBool CApAccessPointItem::IsWlan()
-    {
-    return EFalse;
-    }
-
-
-//----------------------------------------------------------
-// CApAccessPointItem::LimitIp6DNSL
-//----------------------------------------------------------
-//
-void CApAccessPointItem::LimitIp6DNSL()
-    {
-    }
-    
-//  End of File
--- a/apengine/apeng/src/APDataHandler.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,898 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of class CApDataHandler
-*
-*/
-
-
-// INCLUDE FILES
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <nifvar_internal.h>
-#endif
-#include "APEngineVariant.hrh"
-
-#include <cdbcols.h>
-#include <commdb.h>
-#include <cdbpreftable.h>
-#include <etelpckt.h>
-#include <featmgr.h>
-#ifdef __TEST_USE_SHARED_DATA
-    #include <SharedDataClient.h>
-    #include <sharedDataValues.h>
-#endif //__TEST_USE_SHARED_DATA
-#include <WlanCdbCols.h>
-
-#include "ApDataHandler.h"
-#include "ApAccessPointItem.h"
-#include "ApEngineCommons.h"
-#include "ApUtils.h"
-#include "ApEngineVer.h"
-#include "ApEngineLogger.h" 
-#include "ApNetworkItem.h"
-#include "APItemExtra.h"
-#include "APItemCdmaData.h"
-#include "APItemWlanData.h"
-#include "ApSpeedLookup.h"
-
-// CONSTANTS
-#if defined(_DEBUG)
-    _LIT( KErrInvalidIntendedType, "Invalid intended default type" );
-#endif // (_DEBUG)
-_LIT( KErrNoSuchCase, "No such case" );
-
-
-// Agreed GPRS_QOS_WARNING_TIMEOUT Value
-const TInt KGprsOsTimeout = -1;
-
-/**
-* General Settings UID
-*/
-#ifdef __TEST_USE_SHARED_DATA
-    LOCAL_D const TUid KGeneralSettingsUid = { 0X100058EC };
-#endif // __TEST_USE_SHARED_DATA
-
-
-
-
-
-
-_LIT( KWlanBearerName, "WLANBearer" );
-_LIT( KWlanBearerAgent, "wlanagt.agt" );
-_LIT( KWlanBearerNif, "wlannif" );
-
-_LIT( KWlanLDDName, "not used" );
-_LIT( KWlanPDDName, "not used" );
-
-const TInt KWlanLastSocketActivityTimeout = -1;
-const TInt KWlanLastSessionClosedTimeout = 1;
-const TInt KWlanLastSocketClosedTimeout = -1;
-
-
-
-
-
-
-// MACROS
-
-
-// LOCAL FUNCTION PROTOTYPES
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// C++ default constructor can NOT contain any code that
-// might leave.
-//
-// ---------------------------------------------------------
-// CApDataHandler::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApDataHandler* CApDataHandler::NewLC( CCommsDatabase& aDb )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::~CApDataHandler
-// ---------------------------------------------------------
-//
-EXPORT_C CApDataHandler::~CApDataHandler()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::CApDataHandler
-// ---------------------------------------------------------
-//
-EXPORT_C CApDataHandler::CApDataHandler( )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApDataHandler::ConstructL( CCommsDatabase& aDb )
-    {
-    }
-
-
-// query
-// ---------------------------------------------------------
-// CApDataHandler::AccessPointDataL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApDataHandler::AccessPointDataL( TUint32 aUid,
-                                              CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// update
-// ---------------------------------------------------------
-// CApDataHandler::UpdateAccessPointDataL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApDataHandler::UpdateAccessPointDataL
-                                                (
-                                                CApAccessPointItem& aApItem,
-                                                TBool& aNameChanged
-                                                )
-    {
-    }
-
-
-
-// Creating new AP
-// ---------------------------------------------------------
-// CApDataHandler::CreateCopyFromL
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CApDataHandler::CreateCopyFromL( TUint32 aBaseId )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::CreateFromDataL
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CApDataHandler::CreateFromDataL( CApAccessPointItem& aApItem )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// Remove
-// ---------------------------------------------------------
-// CApDataHandler::RemoveAP
-// ---------------------------------------------------------
-//
-EXPORT_C void CApDataHandler::RemoveAPL( TUint32 aUid )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// Getting default access point
-// ---------------------------------------------------------
-// CApDataHandler::DefaultL
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CApDataHandler::DefaultL( TBool aIsWap ) const
-    {
-    return 0;
-    }
-
-
-
-// Setting as default
-// ---------------------------------------------------------
-// CApDataHandler::SetAsDefaultL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApDataHandler::SetAsDefaultL( TUint32 aUid,
-                                            TCommsDbIspType aIntendedType )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// ---------------------------------------------------------
-// Connection Preferene Handling
-// ---------------------------------------------------------
-// ---------------------------------------------------------
-
-
-// ---------------------------------------------------------
-// CApDataHandler::SetPreferredIfDbIapTypeL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApDataHandler::SetPreferredIfDbIapTypeL
-                                    (
-                                    TUint32 aRank,
-                                    TCommDbConnectionDirection aDirection,
-                                    TUint32 aBearers,
-                                    TCommDbDialogPref aPrompt,
-                                    TUint32 aIAP,
-                                    TBool aOverwrite
-                                    )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::SetPreferredIfDbIspTypeL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApDataHandler::SetPreferredIfDbIspTypeL
-                                    (
-                                    TUint32 aRank,
-                                    TCommDbConnectionDirection aDirection,
-                                    TUint32 aBearers,
-                                    TCommDbDialogPref aPrompt,
-                                    TUint32 aISP,
-                                    TUint32 aChargeCard,
-                                    const TDesC& aServiceType,
-                                    TBool aOverwrite
-                                    )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::GetPreferredIfDbIapTypeL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApDataHandler::GetPreferredIfDbIapTypeL
-                                    (
-                                    TUint32 aRank,
-                                    TCommDbConnectionDirection aDirection,
-                                    TUint32& aBearers,
-                                    TUint32& aPrompt,
-                                    TUint32& aIAP
-                                    )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::GetPreferredIfDbIspTypeL
-// ---------------------------------------------------------
-//
-EXPORT_C const TDesC& CApDataHandler::GetPreferredIfDbIspTypeL
-                                    (
-                                    TUint32 /*aRank*/,
-                                    TCommDbConnectionDirection /*aDirection*/,
-                                    TUint32& /*aBearers*/,
-                                    TUint32& /*aPrompt*/,
-                                    TUint32& /*aISP*/,
-                                    TUint32& /*aChargeCard*/
-                                    )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::GetPreferredIfDbIspTypeL
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CApDataHandler::DefaultL( TBool aIsWap,
-                                                 TBool& aReadOnly ) const
-    {
-    return 0;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::RemoveNetworkL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApDataHandler::RemoveNetworkL( TUint32 aUid )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::CreateNetworkL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApDataHandler::CreateNetworkL( CApNetworkItem& aNetwork )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadNetworkPartL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApDataHandler::ReadNetworkPartL( CApAccessPointItem& aItem )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadNetworkL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApDataHandler::ReadNetworkL( TUint32 aUid, 
-                                            CApNetworkItem& aNetwork )
-    {
-    }
-
-
-// ================= OTHER EXPORTED FUNCTIONS ==============
-
-
-// ================= PROTECTED FUNCTIONS ==============
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadWapDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::ReadWapDataL( TUint32 aWapId,
-                                  CApAccessPointItem& aApItem )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadIapDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::ReadIapDataL( TUint32 aIapId,
-                                   CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadIspDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::ReadIspDataL( TUint32 aIspId, 
-                                   CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadGprsDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::ReadGprsDataL( TUint32 aIspId,
-                                    CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadLanDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::ReadLanDataL( TUint32 aIspId,
-                                   CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadDialInOutDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::ReadDialInOutDataL( TUint32 aIspId,
-                                         CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadVpnInfoL
-// ---------------------------------------------------------
-//
-void CApDataHandler::ReadVpnInfoL( TUint32 aIspId, 
-                                   CApAccessPointItem& aApItem)
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::WriteWapBearerDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::WriteWapBearerDataL( TBool aIsNew, TUint32 aWapId,
-                                   CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::WriteWapApDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::WriteWapApDataL( TBool aIsNew, TUint32 aWapId,
-                                   CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::WriteIapDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::WriteIapDataL( TBool aIsNew, TUint32 aIapId,
-                                   CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::WriteIspDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::WriteIspDataL( TBool aIsNew, TUint32 aIspId,
-                                   CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::WriteGprsDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::WriteGprsDataL( TBool aIsNew,
-                                    CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::WriteLanDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::WriteLanDataL( TBool aIsNew,
-                                    CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::DoUpdateAccessPointDataL
-// ---------------------------------------------------------
-//
-TUint32 CApDataHandler::DoUpdateAccessPointDataL
-                                        (
-                                        CApAccessPointItem& aApItem,
-                                        TBool aIsNew,
-                                        TBool& aNameChanged
-                                        )
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::SetDefaultIapIspL
-// ---------------------------------------------------------
-//
-void CApDataHandler::SetDefaultIapIspL( TUint32 aUid )
-    {
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::RemoveWapBearerApL
-// ---------------------------------------------------------
-//
-void CApDataHandler::RemoveWapBearerApL( TUint32 aUid )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::RemoveWapApL
-// ---------------------------------------------------------
-//
-void CApDataHandler::RemoveWapApL( TUint32 aUid )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::RemoveIapL
-// ---------------------------------------------------------
-//
-void CApDataHandler::RemoveIapL( TUint32 aUid )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::RemoveIspL
-// ---------------------------------------------------------
-//
-void CApDataHandler::RemoveIspL( TUint32 aUid, TBool aOut )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::RemoveGprsL
-// ---------------------------------------------------------
-//
-void CApDataHandler::RemoveGprsL( TUint32 aUid, TBool aOut )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::RemoveLanL
-// ---------------------------------------------------------
-//
-void CApDataHandler::RemoveLanL( TUint32 aUid )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::RemoveWlanL
-// ---------------------------------------------------------
-//
-void CApDataHandler::RemoveWlanL( TUint32 aUid )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::HandleBearerChangeIfNeededL
-// ---------------------------------------------------------
-//
-TBool CApDataHandler::HandleBearerChangeIfNeededL
-                                    ( CApAccessPointItem& aApItem )
-    {
-    return EFalse;
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::DoAccessPointDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::DoAccessPointDataL( TUint32 aUid,
-                                         CApAccessPointItem& aApItem )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::DoRemoveAPL
-// ---------------------------------------------------------
-//
-void CApDataHandler::DoRemoveAPL( TUint32 aUid )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::DoSetAsDefaultL
-// ---------------------------------------------------------
-//
-void CApDataHandler::DoSetAsDefaultL( TUint32 aUid,
-                                      TCommsDbIspType aIntendedType )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::DoSetPreferredIfDbIapTypeL
-// ---------------------------------------------------------
-//
-void CApDataHandler::DoSetPreferredIfDbIapTypeL(
-                                 TUint32 aRank,
-                                 TCommDbConnectionDirection aDirection,
-                                 TUint32 aBearers,
-                                 TCommDbDialogPref aPrompt,
-                                 TUint32 aIAP,
-                                 TBool aOverwrite
-                                    )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::DoSetPreferredIfDbIspTypeL
-// ---------------------------------------------------------
-//
-void CApDataHandler::DoSetPreferredIfDbIspTypeL(
-                                 TUint32 /*aRank*/,
-                                 TCommDbConnectionDirection /*aDirection*/,
-                                 TUint32 /*aBearers*/,
-                                 TCommDbDialogPref /*aPrompt*/,
-                                 TUint32 /*aISP*/,
-                                 TUint32 /*aChargeCard*/,
-                                 const TDesC& /*aServiceType*/,
-                                 TBool /*aOverwrite*/
-                                    )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ApSpeed2EtelL
-// ---------------------------------------------------------
-//
-void CApDataHandler::ApSpeed2EtelL( CApAccessPointItem* aItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::EtelSpeed2ApL
-// ---------------------------------------------------------
-//
-void CApDataHandler::EtelSpeed2ApL( CApAccessPointItem& aItem )
-    {
-    }
-
-
-
-// Getting default access point
-// ---------------------------------------------------------
-// CApDataHandler::DoGetDefaultL
-// ---------------------------------------------------------
-//
-TUint32 CApDataHandler::DoGetDefaultL( TBool aIsWap,
-                                             TBool* aReadOnly ) const
-    { // client MUST initiate a transaction, we will NOT !
-    return KErrNotSupported;
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::WriteProxyDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::WriteProxyDataL( TBool aIsNew, 
-                                      const CApAccessPointItem& aApItem )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadProxyDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::ReadProxyDataL( CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::RemoveProxyDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::RemoveProxyDataL( HBufC* aServiceType, TUint32 aIspId )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::WriteNetworkDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::WriteNetworkDataL( TBool aIsNew, 
-                                        CApAccessPointItem& aApItem )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadNetworkDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::ReadNetworkDataL( CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::RemoveNetworkDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::RemoveNetworkDataL( TUint32 aIspId )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::GetLocationIdL
-// ---------------------------------------------------------
-//
-TUint32 CApDataHandler::GetLocationIdL()
-    {
-    return 0;    
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::GetModemBearerIDL
-// ---------------------------------------------------------
-//
-TUint32 CApDataHandler::GetModemBearerIDL( CApAccessPointItem& aApItem )
-    {
-  	User::Leave( KErrInvalidBearerType );
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadServiceL
-// ---------------------------------------------------------
-//
-void CApDataHandler::ReadServiceL( CCommsDbTableView& ispt,
-                                   CApAccessPointItem& aApItem )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadServiceIp6L
-// ---------------------------------------------------------
-//
-void CApDataHandler::ReadServiceIp6L( CCommsDbTableView& ispt,
-                                   CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::WriteServiceL
-// ---------------------------------------------------------
-//
-void CApDataHandler::WriteServiceL( CCommsDbTableView& aTable,
-                                    CApAccessPointItem& aApItem )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApDataHandler::WriteServiceIp6L
-// ---------------------------------------------------------
-//
-void CApDataHandler::WriteServiceIp6L( CCommsDbTableView& ispt,
-                                       CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::WriteCsdDataL
-// ---------------------------------------------------------
-//
-void CApDataHandler::WriteCsdDataL( TBool aIsNew,
-                                    CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadWlanL
-// ---------------------------------------------------------
-//
-void CApDataHandler::ReadWlanL( CCommsDbTableView& lant,
-                                CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::WriteWlanL
-// ---------------------------------------------------------
-//
-void CApDataHandler::WriteWlanL( CCommsDbTableView& aTable,
-                                 CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::CreateLanBearerIfNeededL
-// ---------------------------------------------------------
-//
-TUint32 CApDataHandler::CreateLanBearerIfNeededL()
-    {
-    return KErrNotFound;
-    }
-
-
-
-
-
-
-// ---------------------------------------------------------
-// CApDataHandler::ReadModemBearerNameL
-// ---------------------------------------------------------
-//
-void CApDataHandler::ReadModemBearerNameL( CApAccessPointItem& aApItem )
-    {
-    }
-
-//  End of File
--- a/apengine/apeng/src/APNetworks.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,141 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the CApNetworks class.
-*
-*/
-
-
-// INCLUDE FILES
-#include <cdbcols.h>
-#include <commdb.h>
-#include <eikdef.h>
-#include <d32dbms.h>
-#include <ApNetworkItem.h>
-#include <ApNetworkItemList.h>
-#include <ApEngineConsts.h>
-
-#include <comms-infras/commdb/protection/protectdb.h>
-
-#include "ApNetworks.h"
-#include "ApEngineLogger.h"
-#include "ApEngineCommons.h"
-
-
-
-
-// LOCAL CONSTANTS AND MACROS
-
-// LOCAL FUNCTION PROTOTYPES
-
-// ================= MEMBER FUNCTIONS =======================
-// Two-phased constructor.
-// ---------------------------------------------------------
-// CApNetworks::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApNetworks* CApNetworks::NewLC( CCommsDatabase& aDb )
-    {
-    return NULL;
-    }
-
-
-// Destructor
-// ---------------------------------------------------------
-// CApNetworks::~CApNetworks
-// ---------------------------------------------------------
-//
-EXPORT_C CApNetworks::~CApNetworks()
-    {
-    }
-
-
-// C++ default constructor can NOT contain any code that
-// might leave.
-//
-// ---------------------------------------------------------
-// CApNetworks::CApNetworks
-// ---------------------------------------------------------
-//
-EXPORT_C CApNetworks::CApNetworks()
-:iCount( 0 )
-    {
-    }
-
-
-// Symbian OS default constructor can leave.
-// ---------------------------------------------------------
-// CApNetworks::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApNetworks::ConstructL( CCommsDatabase& aDb )
-
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApNetworks::Count
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CApNetworks::Count() const
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CApNetworks::Name
-// ---------------------------------------------------------
-//
-EXPORT_C const TDesC& CApNetworks::NameL( TUint32 aUid ) const
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-
-
-
-// ---------------------------------------------------------
-// CApNetworks::AllListItemDataL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApNetworks::AllListItemDataL( CApNetworkItemList& aList )
-    {
-    return 0;
-    }
-
-
-
-
-// ================= OTHER EXPORTED FUNCTIONS ==============
-
-// ================== OTHER MEMBER FUNCTIONS ===============
-
-
-
-// ---------------------------------------------------------
-// CApNetworks::DoUpdate
-// ---------------------------------------------------------
-//
-TInt CApNetworks::DoUpdateL()
-    {
-    return KErrNotFound;
-    }
-
-
-
-// End of File
--- a/apengine/apeng/src/APSelect.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,637 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the CApSelect class.
-*
-*/
-
-
-// INCLUDE FILES
-#include <cdbcols.h>
-#include <commdb.h>
-#include <eikdef.h>
-#include <d32dbms.h>
-#include <featmgr.h>
-#include <comms-infras/commdb/protection/protectdb.h>
-
-#include <etelpckt.h>
-#ifdef __TEST_USE_SHARED_DATA
-    #include <sharedDataValues.h>
-#endif // __TEST_USE_SHARED_DATA
-
-#include "ApListItem.h"
-#include "ApListItemList.h"
-#include "ApSelect.h"
-#include "ApUtils.h"
-#include "ApEngineCommons.h"
-#include <ApEngineConsts.h>
-#include "ApEngineLogger.h"
-#include "ApListItemKey.h"
-
-
-
-
-// CONSTANTS
-const TInt KCursorNullPos = 0;
-const TInt KItemCountNull = 0;
-
-#ifdef __TEST_USE_SHARED_DATA
-    // General Settings UID, Hardcoded
-    const TUid KGeneralSettingsUid={0X100058EC};
-#endif // __TEST_USE_SHARED_DATA
-
-
-const TInt KDIALOUT     = 0;
-const TInt KGPRSIN      = 1;
-const TInt KGPRSOUT     = 2;
-const TInt KCDMA_ISP    = 3;
-const TInt KVPN         = 4;
-
-
-const TInt  KUID        = 0;
-const TInt  KISPTYPE    = 1;
-const TInt  KBEARERTYPE = 2;
-
-
-
-// LOCAL CONSTANTS AND MACROS
-#define VPN_SERVICE_SNAP    _S("HomeSNAP")
-
-// LOCAL FUNCTION PROTOTYPES
-
-// ================= MEMBER FUNCTIONS =======================
-// Two-phased constructor.
-// ---------------------------------------------------------
-// CApSelect::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApSelect* CApSelect::NewLC( CCommsDatabase& aDb,
-                                     TInt aIspFilter,
-                                     TInt aBearerFilter,
-                                     TInt aSortType )
-    {
-    return NULL;
-    }
-
-
-// Destructor
-// ---------------------------------------------------------
-// CApSelect::~CApSelect
-// ---------------------------------------------------------
-//
-EXPORT_C CApSelect::~CApSelect()
-    {
-    }
-
-
-// C++ default constructor can NOT contain any code that
-// might leave.
-//
-// ---------------------------------------------------------
-// CApSelect::CApSelect
-// ---------------------------------------------------------
-//
-EXPORT_C CApSelect::CApSelect()
-:iCursor( KCursorNullPos ),
-iCount( KItemCountNull )
-    {
-    }
-
-
-// Symbian OS default constructor can leave.
-// ---------------------------------------------------------
-// CApSelect::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApSelect::ConstructL( CCommsDatabase& aDb,
-                                 TInt aIspFilter,
-                                 TInt aBearerFilter,
-                                 TInt aSortType )
-
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::SetFilters
-// ---------------------------------------------------------
-//
-EXPORT_C void CApSelect::SetFiltersL( TInt aIspFilter,
-                                    TInt aBearerFilter,
-                                    TInt aSortType )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelect::IspTypeFilter
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApSelect::IspTypeFilter()
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CApSelect::BearerFilter
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApSelect::BearerFilter()
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CApSelect::SortOrder
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApSelect::SortOrder()
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::MoveToFirst
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApSelect::MoveToFirst()
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApSelect::MoveNext
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApSelect::MoveNext()
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApSelect::MoveLast
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApSelect::MoveLast()
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApSelect::MovePrev
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApSelect::MovePrev()
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApSelect::Count
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CApSelect::Count()
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CApSelect::Name
-// ---------------------------------------------------------
-//
-EXPORT_C const TDesC& CApSelect::Name()
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApSelect::Uid
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CApSelect::Uid()
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CApSelect::Type
-// ---------------------------------------------------------
-//
-EXPORT_C TCommsDbIspType CApSelect::Type()
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApSelect::BearerType
-// ---------------------------------------------------------
-//
-EXPORT_C TApBearerType CApSelect::BearerType()
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSelect::AllListItemDataL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApSelect::AllListItemDataL( CApListItemList& aList )
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::IsReadOnly
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApSelect::IsReadOnly() const
-    {
-    return EFalse;
-    }
-
-
-
-// ================= OTHER EXPORTED FUNCTIONS ==============
-
-// ================== OTHER MEMBER FUNCTIONS ===============
-
-
-
-// ---------------------------------------------------------
-// CApSelect::DoUpdate
-// ---------------------------------------------------------
-//
-TInt CApSelect::DoUpdateL()
-    {
-    return KErrNotSupported;
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApSelect::GetFilteredSortedWapTableViewLC
-// ---------------------------------------------------------
-//
-CCommsDbTableView* CApSelect::GetFilteredSortedWapTableViewLC()
-    {
-    return NULL;
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApSelect::GetFilteredSortedIpBearerTableViewLC()
-// ---------------------------------------------------------
-//
-CCommsDbTableView* CApSelect::GetFilteredSortedIpBearerTableViewLC()
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::GetFilteredSortedIspOutTableViewLC()
-// ---------------------------------------------------------
-//
-CCommsDbTableView* CApSelect::GetFilteredSortedIspOutTableViewLC()
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::GetFilteredSortedGprsTableViewLC()
-// ---------------------------------------------------------
-//
-CCommsDbTableView* CApSelect::GetFilteredSortedGprsTableViewLC( TBool aIn )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::GetUintValuesL
-// ---------------------------------------------------------
-//
-void CApSelect::GetUintValuesL( CCommsDbTableView* aTable,
-                                const TDesC& aField,
-                                CArrayFixFlat<TUint32>& aArray )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::GetProtValuesL
-// ---------------------------------------------------------
-//
-void CApSelect::GetProtValuesL( CCommsDbTableView* aTable,
-                                CArrayFixFlat<TUint32>& aArray )
-    {    
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSelect::GetTextValuesL
-// ---------------------------------------------------------
-//
-void CApSelect::GetTextValuesL( CCommsDbTableView* aTable,
-                                const TDesC& aField,
-                                CArrayPtrFlat<HBufC>& aArray )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::GetLongTextValuesL
-// ---------------------------------------------------------
-//
-void CApSelect::GetLongTextValuesL( CCommsDbTableView* aTable,
-                                    const TDesC& aField,
-                                    CArrayPtrFlat<HBufC>& aArray )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::IsInArray
-// ---------------------------------------------------------
-//
-TBool CApSelect::IsInArray( CArrayFixFlat<TUint32>* aArray, TUint32 aValue )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::PosInArray
-// ---------------------------------------------------------
-//
-TInt CApSelect::PosInArray( CArrayFixFlat<TUint32>* aArray, TUint32 aValue )
-    {
-    return KErrNotFound;
-    }
-
-
-// ---------------------------------------------------------
-// CApSelect::GetItemPos
-// ---------------------------------------------------------
-//
-TInt CApSelect::GetItemPos( CApListItemList* aList, TUint32 aId )
-    {
-    return KErrNotFound;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::OpenViewMatchingTextL
-// ---------------------------------------------------------
-//
-CCommsDbTableView* CApSelect::OpenViewMatchingTextL(
-                                             const TDesC& aTableName,
-                                             const TDesC& aColumnToMatch,
-                                             const TDesC16& aValueToMatch )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::GetIspValuesL
-// ---------------------------------------------------------
-//
-void CApSelect::GetIspValuesL( CCommsDbTableView* aTable,
-                               CArrayFixFlat<TUint32[3]>* aArray,
-                               const TDesC& aColName )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSelect::GetIapPos
-// ---------------------------------------------------------
-//
-TInt CApSelect::GetIapPos( CArrayFixFlat<TUint32[3]>* aArray, TUint32 aValue )
-    {
-    return KErrNotFound;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::SortLocalisedNameL()
-// ---------------------------------------------------------
-//
-void CApSelect::SortLocalisedNameL( TBool aAscending )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSelect::SortUidL()
-// ---------------------------------------------------------
-//
-void CApSelect::SortUidL( TBool aAscending )
-    {
-    }
-
-// ---------------------------------------------------------
-// CApSelect::NewLC()
-// ---------------------------------------------------------
-//
-EXPORT_C CApSelect* CApSelect::NewLC( CCommsDatabase& aDb,
-                                      TInt aIspFilter,
-                                      TInt aBearerFilter,
-                                      TInt aSortType,
-                                      TInt aReqIpvType
-                                      )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApSelect::ConstructL( CCommsDatabase& aDb,
-                                 TInt aIspFilter,
-                                 TInt aBearerFilter,
-                                 TInt aSortType,
-                                 TInt aReqIpvType )
-
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSelect::NewLC()
-// ---------------------------------------------------------
-//
-EXPORT_C CApSelect* CApSelect::NewLC( CCommsDatabase& aDb,
-                                      TInt aIspFilter,
-                                      TInt aBearerFilter,
-                                      TInt aSortType,
-                                      TInt aReqIpvType,
-                                      TVpnFilterType aVpnFilterType
-                                      )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::NewLC()
-// ---------------------------------------------------------
-//
-EXPORT_C CApSelect* CApSelect::NewLC( CCommsDatabase& aDb,
-                                      TInt aIspFilter,
-                                      TInt aBearerFilter,
-                                      TInt aSortType,
-                                      TInt aReqIpvType,
-                                      TVpnFilterType aVpnFilterType,
-                                      TBool aIncludeEasyWlan )
-    {
-    return NULL;    
-    }
-
-
-// ---------------------------------------------------------
-// CApSelect::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApSelect::ConstructL( CCommsDatabase& aDb,
-                                 TInt aIspFilter,
-                                 TInt aBearerFilter,
-                                 TInt aSortType,
-                                 TInt aReqIpvType,
-                                 TVpnFilterType aVpnFilterType )
-    {
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApSelect::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApSelect::ConstructL( CCommsDatabase& aDb,
-                                 TInt aIspFilter,
-                                 TInt aBearerFilter,
-                                 TInt aSortType,
-                                 TInt aReqIpvType,
-                                 TVpnFilterType aVpnFilterType,
-                                 TBool aIncludeEasyWlan )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::SetFiltersL
-// ---------------------------------------------------------
-//
-void CApSelect::SetFiltersL( TInt aIspFilter, TInt aBearerFilter,
-                             TInt aSortType, TInt aReqIpvType,
-                             TInt aVpnFilterType )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::GetVpnTableViewLC()
-// ---------------------------------------------------------
-//
-CCommsDbTableView* CApSelect::GetVpnTableViewLC( )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelect::GetVpnValuesL
-// ---------------------------------------------------------
-//
-void CApSelect::GetVpnValuesL( CCommsDbTableView* aTable,
-                               CArrayFixFlat<TVpnData>* aVpnArray )
-    { // get the VPN values
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApSelect::AddLanL
-// ---------------------------------------------------------
-//
-void CApSelect::AddLanL( TBool aWlan )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelect::GetSupportedBearerSet
-// ---------------------------------------------------------
-//
-TInt CApSelect::GetSupportedBearerSet( TInt aBearerFilter )
-    {
-    return 0;
-    }
-
-
-// End of File
--- a/apengine/apeng/src/APUtils.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,373 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the class CApUtils
-*     Contains utility functions for access point handling
-*
-*/
-
-
-// INCLUDE FILES
-#include "APEngineVariant.hrh"
-
-#include "ApUtils.h"
-#include "ApAccessPointItem.h"
-#include "ApDataHandler.h"
-#include "ApEngineCommons.h"
-#include "ApEngineLogger.h"
-#include <e32des16.h>
-#include <es_sock.h>
-#include <es_enum.h>
-
-#include    <featmgr.h>
-
-#include <WlanCdbCols.h>
-
-
-// LOCAL CONSTANTS AND MACROS
-
-// MODULE DATA STRUCTURES
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// construct/destruct/copy
-// ---------------------------------------------------------
-// CApUtils::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApUtils* CApUtils::NewLC( CCommsDatabase& aDb )
-    {
-    return NULL;
-    }
-
-
-
-// Destructor
-// ---------------------------------------------------------
-// CApUtils::~CApUtils
-// ---------------------------------------------------------
-//
-EXPORT_C CApUtils::~CApUtils()
-    {
-    }
-
-
-// C++ default constructor can NOT contain any code that
-// might leave.
-//
-// ---------------------------------------------------------
-// CApUtils::CApUtils
-// ---------------------------------------------------------
-//
-EXPORT_C CApUtils::CApUtils()
-    {
-    }
-
-
-// Symbian OS default constructor can leave.
-// ---------------------------------------------------------
-// CApUtils::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApUtils::ConstructL( CCommsDatabase& aDb )
-    {
-    }
-
-
-
-
-
-// utilities
-
-// ---------------------------------------------------------
-// CApUtils::IsAPInUseL
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApUtils::IsAPInUseL( TUint32 aUid )
-    {
-    return EFalse;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApUtils::WapBearerTypeL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApUtils::WapBearerTypeL( TUint32 aUid, TDes& aBearer )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApUtils::BearerTypeL
-// ---------------------------------------------------------
-//
-EXPORT_C TApBearerType CApUtils::BearerTypeL( TUint32 aUid )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApUtils::ISPTypeL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApUtils::ISPTypeL( TUint32 aUid, TCommsDbIspType& aIspType )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApUtils::IsValidNameL
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApUtils::IsValidNameL( const TDesC& aNameText )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApUtils::MakeValidName
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApUtils::MakeValidNameL( TDes& aNameText )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApUtils::NameL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApUtils::NameL( TUint32 aUid, TDes& aName )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApUtils::SetNameL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApUtils::SetNameL( TDes& aName, TUint32 aUid )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApUtils::SetISPTypeL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApUtils::SetISPTypeL( TUint32 aUid, TCommsDbIspType aIspType )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApUtils::IapIdFromWapIdL
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CApUtils::IapIdFromWapIdL( TUint32 aUid )
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CApUtils::WapIdFromIapIdL
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CApUtils::WapIdFromIapIdL( TUint32 aUid )
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CApUtils::HasMandatoryFieldsFilledL
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApUtils::HasMandatoryFieldsFilledL( TUint32 aUid )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApUtils::IAPExistsL
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApUtils::IAPExistsL( TUint32 aUid )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApUtils::WapApExistsL
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApUtils::WapApExistsL( TUint32 aUid )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApUtils::DoHasMandatoryFieldsFilledL
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApUtils::DoHasMandatoryFieldsFilledL(
-                                                  TUint32 aUid,
-                                                  CCommsDbTableView* aWapt,
-                                                  TApBearerType aBearertype )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApUtils::IsValidNameL
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApUtils::IsValidNameL( const TDesC& aNameText,
-                                       TUint32 aAcceptUid )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApUtils::IsReadOnlyL
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApUtils::IsReadOnlyL( TUint32 aUid )
-    {
-    return EFalse;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApUtils::IsWlanL
-// ---------------------------------------------------------
-//
-TBool CApUtils::IsWlanL( TUint32 aLanCommdbId )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApUtils::HasWlanSSIDL
-// ---------------------------------------------------------
-//
-TBool CApUtils::HasWlanSSIDL( TUint32 aLanCommdbId )
-    {
-    return EFalse;
-    }
-
-
-// ==== OTHER PRIVATE/protected, NON-EXPORTED FUNCTIONS ====
-
-// ---------------------------------------------------------
-// CApUtils::DoWapBearerTypeL
-// ---------------------------------------------------------
-//
-void CApUtils::DoWapBearerTypeL( TUint32 aUid, TDes& aBearer )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApUtils::DoBearerTypeL
-// ---------------------------------------------------------
-//
-TApBearerType CApUtils::DoBearerTypeL( TUint32 aUid )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// ---------------------------------------------------------
-// CApUtils::DoISPTypeL
-// ---------------------------------------------------------
-//
-void CApUtils::DoISPTypeL( TUint32 aUid, TCommsDbIspType& aIspType )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApUtils::DoNameL
-// ---------------------------------------------------------
-//
-void CApUtils::DoNameL( TUint32 aUid, TDes& aName )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApUtils::DoSetNameL
-// ---------------------------------------------------------
-//
-void CApUtils::DoSetNameL( TDes& aName, TUint32 aUid )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApUtils::DoSetISPTypeL
-// ---------------------------------------------------------
-//
-void CApUtils::DoSetISPTypeL( TUint32 aUid, TCommsDbIspType aIspType )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApUtils::DoesExistsL
-// ---------------------------------------------------------
-//
-TBool CApUtils::DoesExistsL( TPtrC aTable, TUint32 aUid )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApUtils::DoIsWlanL
-// ---------------------------------------------------------
-//
-TBool CApUtils::DoIsWlanL( TUint32 aLanCommdbId )
-    {
-    return EFalse;
-    }
-
-//  End of File
--- a/apengine/apeng/src/ActiveApDb.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,115 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Implementation of CActiveApDb.
-*
-*/
-
-
-// INCLUDE FILES
-
-#include <ActiveApDb.h>
-#include "ActiveApDbNotifier.h"
-#include <ApEngineConsts.h>
-#include "ApEngineCommons.h"
-#include "ApEngineLogger.h"
-
-const TInt KObserverArrayGranularity = 1;
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CActiveApDb::NewL
-// ---------------------------------------------------------
-//
-EXPORT_C CActiveApDb* CActiveApDb::NewL( TCommDbDatabaseType /*aType*/ )
-    {
-    return NULL;
-    }
-
-// ---------------------------------------------------------
-// CActiveApDb::~CActiveApDb
-// ---------------------------------------------------------
-//
-EXPORT_C CActiveApDb::~CActiveApDb()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CActiveApDb::CActiveApDb
-// ---------------------------------------------------------
-//
-CActiveApDb::CActiveApDb()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CActiveApDb::ConstructL
-// ---------------------------------------------------------
-//
-void CActiveApDb::ConstructL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CActiveApDb::AddObserverL
-// ---------------------------------------------------------
-//
-EXPORT_C void CActiveApDb::AddObserverL( MActiveApDbObserver* anObserver )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CActiveApDb::RemoveObserver
-// ---------------------------------------------------------
-//
-EXPORT_C void CActiveApDb::RemoveObserver( MActiveApDbObserver* anObserver )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CActiveApDb::Database
-// ---------------------------------------------------------
-//
-EXPORT_C CCommsDatabase*  CActiveApDb::Database()
-    {
-    return NULL;
-    }
-
-// ---------------------------------------------------------
-// CActiveApDb::HandleDbEventL
-// ---------------------------------------------------------
-//
-void CActiveApDb::HandleDbEventL( TInt anEvent )
-    {
-
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CActiveApDb::NotifyObserversL
-// ---------------------------------------------------------
-//
-void CActiveApDb::NotifyObserversL( MActiveApDbObserver::TEvent anEvent )
-    {
-
-    }
-
-// End of File
--- a/apengine/apeng/src/ActiveApDbNotifier.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,85 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Implementation of CActiveApDbNotifier.
-*
-*/
-
-
-// INCLUDE FILES
-
-#include "ActiveApDb.h"
-#include "ActiveApDbNotifier.h"
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CActiveApDbNotifier::CActiveApDbNotifier
-// ---------------------------------------------------------
-//
-CActiveApDbNotifier::CActiveApDbNotifier( CActiveApDb& aDb )
-: CActive( EPriorityStandard )
-    {
-    }
-
-// ---------------------------------------------------------
-// CActiveApDbNotifier::~CActiveApDbNotifier
-// ---------------------------------------------------------
-//
-CActiveApDbNotifier::~CActiveApDbNotifier()
-    {
-    }
-
-// ---------------------------------------------------------
-// CActiveApDbNotifier::RunL
-// ---------------------------------------------------------
-//
-void CActiveApDbNotifier::RunL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CActiveApDbNotifier::DoCancel
-// ---------------------------------------------------------
-//
-void CActiveApDbNotifier::DoCancel()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CActiveApDbNotifier::Stop
-// ---------------------------------------------------------
-//
-void CActiveApDbNotifier::Stop()
-    {
-    }
-
-// ---------------------------------------------------------
-// CActiveApDbNotifier::Start
-// ---------------------------------------------------------
-//
-void CActiveApDbNotifier::Start()
-    {
-    }
-
-// ---------------------------------------------------------
-// CActiveApDbNotifier::NotifyChange
-// ---------------------------------------------------------
-//
-void CActiveApDbNotifier::NotifyChange()
-    {
-    }
-
-// End of File
--- a/apengine/apeng/src/ApEngineCommons.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,274 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of some common global functions.
-*
-*/
-
-
-// INCLUDE FILES
-#include <eikdef.h>
-#include <ApEngineConsts.h>
-#include <commdb.h>
-#include <ApUtils.h>
-#include <centralrepository.h> // link against centralrepository.lib
-
-#include "ApEngineCommons.h"
-#include "ApProtHandler.h"
-#include "ApEngineLogger.h"
-#include "ApEnginePrivateCRKeys.h"    
-
-// CONSTANTS
-
-
-// LOCAL CONSTANTS AND MACROS
-_LIT(KFormatPostfix, "%S(%02d)");
-_LIT(KFormatNoPostfix, "%S");
-_LIT(KFormatLargePostfix, "%S(%d)");
-
-void ApCommons::Panic( TApEnginePanicCodes aPanic )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// ApCommons::StartPushedTransactionL
-// ---------------------------------------------------------
-//
-TBool ApCommons::StartPushedTransactionLC( CCommsDatabase& aDb, TBool aRetry )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// ApCommons::RollbackTransactionOnLeave
-// ---------------------------------------------------------
-//
-void ApCommons::RollbackTransactionOnLeave( TAny* aDb )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// ApCommons::DoMakeValidNameL
-// ---------------------------------------------------------
-//
-HBufC* ApCommons::DoMakeValidNameL
-                            (
-                            CCommsDatabase& aDb,
-                            TBool& aChanged,
-                            HBufC* aName,
-                            TUint32 aUid,
-                            TBool aIsNew
-                            )
-    {
-    return NULL;
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// ApCommons::EnsureMaxLengthLC
-// ---------------------------------------------------------
-//
-HBufC* ApCommons::EnsureMaxLengthLC( const TDesC* aName, TBool& aChanged )
-    {
-    return NULL;
-    }
-
-
-
-
-/**
-* Given aName in the format <prefix> or <prefix><brace><integer><brace>,
-* return a pointer to the leading part.
-* That is, if there is trailing <space><integer>,
-* then that is excluded; if there is no trailing part, then the original
-* decriptor is returned.
-* Examples:
-*   - "Foo" returns "Foo";
-*   - "Foo 12" returns "Foo 12";
-*   - "Foo(12)" returns "Foo";
-*   - "Foo 12 (34)" returns "Foo 12 ";
-*   - "Foo bar" returns "Foo bar";
-*   - "Foo " returns "Foo ".
-*/
-TPtrC ApCommons::GetPrefix( const TDesC& aName )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-/**
-* If aName is constructed from aPrefix with a postfix, get the numeric
-* value of the postfix, e.g:
-*   - GetPostfix( "Foo (3)", "Foo" ) == 3
-*   - GetPostfix( "Foo 23 (45)", "Foo 23" ) == 45
-* If aName is the same as aPrefix, return 0, e.g.:
-*   - GetPostfix( "Foo", "Foo" ) == 0
-* If aName is not constructed from aPrefix, return -1, e.g.:
-*   - GetPostfix( "Foobar", "Foo" ) == -1
-*   - GetPostfix( "Fo 23 45", "Foo" ) == -1
-*/
-TInt ApCommons::GetPostfix( const TDesC& aName, const TDesC& aPrefix )
-    {
-    return 0;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// ApCommons::ReadUintL
-// ---------------------------------------------------------
-//
-TInt ApCommons::ReadUintL
-                    (
-                    CCommsDbTableView* atable,
-                    const TDesC& aColumn,
-                    TUint32& aValue
-                    )
-    {
-    return KErrUnknown;
-    }
-
-
-// ---------------------------------------------------------
-// ApCommons::ReadBoolL
-// ---------------------------------------------------------
-//
-TInt ApCommons::ReadBoolL
-                    (
-                    CCommsDbTableView* atable,
-                    const TDesC& aColumn,
-                    TBool& aValue
-                    )
-    {
-    return KErrUnknown;
-    }
-
-
-
-// ---------------------------------------------------------
-// ApCommons::ReadLongTextLC
-// ---------------------------------------------------------
-//
-HBufC* ApCommons::ReadLongTextLC
-                        (
-                        CCommsDbTableView* atable,
-                        const TDesC& aColumn,
-                        TInt& aErrCode
-                        )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// ApCommons::ReadLongTextL
-// ---------------------------------------------------------
-//
-HBufC* ApCommons::ReadLongTextL( CCommsDbTableView* atable,
-                                  const TDesC& aColumn )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// ApCommons::EscapeTextLC
-// ---------------------------------------------------------
-//
-HBufC* ApCommons::EscapeTextLC( const TDesC& aLiteral )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// ApCommons::ReadText16ValueL
-// ---------------------------------------------------------
-//
-HBufC16* ApCommons::ReadText16ValueLC( CCommsDbTableView* atable,
-                                 const TDesC& aCol )
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// ApCommons::ReadText8ValueLC
-// ---------------------------------------------------------
-//
-HBufC8* ApCommons::ReadText8ValueLC( CCommsDbTableView* atable,
-                                 const TDesC& aCol )
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// ApCommons::DoGetReadOnlyL
-// ---------------------------------------------------------
-//
-TBool ApCommons::DoGetReadOnlyL( CCommsDbTableView& aTable )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// ApCommons::CommitTransaction
-// ---------------------------------------------------------
-//
-TInt ApCommons::CommitTransaction( CCommsDatabase& aDb )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-
-//----------------------------------------------------------
-// ApCommons::GetVariantL
-//----------------------------------------------------------
-//
-TInt ApCommons::GetVariantL()
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// ApCommons::IsGivenSharedDataSupportL
-// ---------------------------------------------------------
-//
-TInt ApCommons::IsGivenSharedDataSupportL( const TUid aUid, 
-                                           const TUint32 aKey )
-    {
-    return 0;    
-    }
-
-
-// End of File
--- a/apengine/apeng/src/ApEngineLogger.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,96 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*      Implementation of class ApEngineLogger.   
-*      
-*
-*/
-
-
-// INCLUDE FILES
-
-#ifdef __TEST_APENGINE_LOG__
-
-    #include "ApEngineLogger.h"
-    #include <flogger.h>
-
-    // ================= CONSTANTS =======================
-
-    /// ApEngine logging directory.
-    _LIT( KApEngineLogDir, "ApEngine" );
-    /// ApEngine log file name.
-    _LIT( KApEngineLogFile, "ApEngine.txt" );
-
-
-    // ================= MEMBER FUNCTIONS =======================
-
-    // ---------------------------------------------------------
-    // ApEngineLogger::Write()
-    // ---------------------------------------------------------
-    //
-    void ApEngineLogger::Write
-    ( TInt32 aMask, TInt aLevel, TRefByValue<const TDesC16> aFmt, ... )
-        {
-        }
-
-
-    // ---------------------------------------------------------
-    // ApEngineLogger::Write()
-    // ---------------------------------------------------------
-    //
-    void ApEngineLogger::Write
-    ( TInt32 aMask, TInt aLevel, 
-      TRefByValue<const TDesC16> aFmt, 
-      VA_LIST& aList )
-        {
-        }
-
-
-    // ---------------------------------------------------------
-    // ApEngineLogger::Write()
-    // ---------------------------------------------------------
-    //
-    void ApEngineLogger::Write
-    ( TInt32 aMask, TInt aLevel, TRefByValue<const TDesC8> aFmt, ... )
-        {
-        }
-
-
-    // ---------------------------------------------------------
-    // ApEngineLogger::Write()
-    // ---------------------------------------------------------
-    //
-    void ApEngineLogger::Write
-    ( TInt32 aMask, TInt aLevel, 
-      TRefByValue<const TDesC8> aFmt, VA_LIST& aList )
-        {
-        }
-
-
-    // ---------------------------------------------------------
-    // ApEngineLogger::HexDump()
-    // ---------------------------------------------------------
-    //
-    void ApEngineLogger::HexDump
-            (
-            TInt32 aMask,
-            TInt aLevel, 
-            const TText* aHeader,
-            const TText* aMargin,
-            const TUint8* aPtr,
-            TInt aLen
-            )
-        {
-        }
-#endif // __TEST_APENGINE_LOG__
--- a/apengine/apeng/src/ApListItem.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,297 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declaration of the CApSelect class.
-*
-*/
-
-
-// INCLUDE FILES
-#include <eikdef.h>
-
-#include "ApListItem.h"
-#include "ApEngineLogger.h"
-#include "ApEngineCommons.h"
-
-// LOCAL FUNCTION PROTOTYPES
-
-// ================= MEMBER FUNCTIONS =======================
-// Two-phased constructor.
-// ---------------------------------------------------------
-// CApListItem::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApListItem* CApListItem::NewLC()
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CApListItem::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApListItem* CApListItem::NewLC
-                                        (
-                                        TCommsDbIspType aIspType,
-                                        TUint32 aUid,
-                                        const TDesC& aName,
-                                        TApBearerType aBearerType
-                                        )
-    {
-    (void)aIspType;
-    (void)aUid;
-    (void)aName;
-    (void)aBearerType;
-    return NULL;
-    }
-
-
-EXPORT_C CApListItem* CApListItem::NewLC
-                                        (
-                                        TCommsDbIspType aIspType,
-                                        TUint32 aUid,
-                                        const TDesC& aName,
-                                        TApBearerType aBearerType,
-                                        const TDesC& aStartPage,
-                                        TBool aReadOnly
-                                        )
-    {
-    (void)aIspType;
-    (void)aUid;
-    (void)aName;
-    (void)aBearerType;
-    (void)aStartPage;
-    (void)aReadOnly;
-    return NULL;
-    }
-
-// ---------------------------------------------------------
-// CApListItem::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApListItem* CApListItem::NewLC( CApListItem* aItem )
-    {
-    (void)aItem;
-    return NULL;
-    }
-
-
-// Destructor
-// ---------------------------------------------------------
-// CApListItem::~CApListItem
-// ---------------------------------------------------------
-//
-EXPORT_C CApListItem::~CApListItem()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApListItem::CopyFromL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApListItem::CopyFromL( const CApListItem& aCopyFrom )
-    {
-    (void)aCopyFrom;
-    }
-
-
-// C++ default constructor can NOT contain any code that
-// might leave.
-//
-// ---------------------------------------------------------
-// CApListItem::CApListItem
-// ---------------------------------------------------------
-//
-EXPORT_C CApListItem::CApListItem()
-:iIspType( EIspTypeInternetAndWAP ),
-iUid( 0 ),
-iBearerType( EApBearerTypeGPRS )
-    {
-    }
-
-
-// Symbian OS default constructor can leave.
-// ---------------------------------------------------------
-// CApListItem::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApListItem::ConstructL()
-    {
-    }
-
-
-// Symbian OS default constructor can leave.
-// ---------------------------------------------------------
-// CApListItem::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApListItem::ConstructL( TCommsDbIspType aIspType,
-                                      TUint32 aUid,
-                                      const TDesC& aName,
-                                      TApBearerType aBearerType )
-    {
-    (void)aIspType;
-    (void)aUid;
-    (void)aName;
-    (void)aBearerType;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApListItem::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApListItem::ConstructL( TCommsDbIspType aIspType,
-                                      TUint32 aUid,
-                                      const TDesC& aName,
-                                      TApBearerType aBearerType,
-                                      const TDesC& aStartPage
-                                      )
-    {
-    (void)aIspType;
-    (void)aUid;
-    (void)aName;
-    (void)aBearerType;
-    (void)aStartPage;
-    }
-
-
-// ---------------------------------------------------------
-// CApListItem::SetItemL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApListItem::SetItemL( TCommsDbIspType aIspType,
-                                    TUint32 aUid,
-                                    const TDesC& aName,
-                                    TApBearerType aBearerType )
-    {
-    (void)aIspType;
-    (void)aUid;
-    (void)aName;
-    (void)aBearerType;
-    }
-
-
-// ---------------------------------------------------------
-// CApListItem::SetItemL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApListItem::SetItemL( TCommsDbIspType aIspType,
-                                    TUint32 aUid,
-                                    const TDesC& aName,
-                                    TApBearerType aBearerType,
-                                    const TDesC& aStartpage
-                                    )
-    {
-    (void)aIspType;
-    (void)aUid;
-    (void)aName;
-    (void)aBearerType;
-    }
-
-
-// ---------------------------------------------------------
-// CApListItem::Name
-// ---------------------------------------------------------
-//
-EXPORT_C const TDesC& CApListItem::Name()
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApListItem::Uid
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CApListItem::Uid()
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CApListItem::Type
-// ---------------------------------------------------------
-//
-EXPORT_C TCommsDbIspType CApListItem::Type()
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// ---------------------------------------------------------
-// CApListItem::BearerType
-// ---------------------------------------------------------
-//
-EXPORT_C TApBearerType CApListItem::BearerType()
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApListItem::StartPage
-// ---------------------------------------------------------
-//
-EXPORT_C const TDesC& CApListItem::StartPage() const
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApListItem::IsReadOnly
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApListItem::IsReadOnly() const
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApListItem::IsVpnAp
-// ---------------------------------------------------------
-//
-TBool CApListItem::IsVpnAp() const
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApListItem::CreateExtraL
-// ---------------------------------------------------------
-//
-void CApListItem::CreateExtraL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApListItem::SetVpnFlag
-// ---------------------------------------------------------
-//
-void CApListItem::SetVpnFlag( TBool aIsVpn )
-    {
-    (void)aIsVpn;
-    }
-
-//  End of File
--- a/apengine/apeng/src/ApListItemKey.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the TApListItemKey class.
-*
-*/
-
-
-// INCLUDE FILES
-
-#include "ApListItemList.h"
-#include "ApListItem.h"
-#include "ApListItemKey.h"
-
-// CONSTANTS
-
-
-// ================= MEMBER FUNCTIONS =======================
-// ---------------------------------------------------------
-// TApListItemNameKey::SetPtr()
-// ---------------------------------------------------------
-//
-void TApListItemNameKey::SetPtr( CApListItemList* aPtr )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// TApListItemNameKey::Compare()
-// ---------------------------------------------------------
-//
-TInt TApListItemNameKey::Compare( TInt aLeft,TInt aRight ) const
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// TApListItemNameKey::At()
-// ---------------------------------------------------------
-//
-TAny* TApListItemNameKey::At( TInt anIndex ) const
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// TApListItemNameKey::TApListItemNameKey()
-// ---------------------------------------------------------
-//
-TApListItemNameKey::TApListItemNameKey(  TBool aAscending )
-:TKeyArrayFix( 0, ECmpCollated )
-        {
-        }
-
-
-
-
-
-
-// ---------------------------------------------------------
-// TApListItemUidKey 
-// ---------------------------------------------------------
-
-
-// ---------------------------------------------------------
-// TApListItemUidKey::SetPtr
-// ---------------------------------------------------------
-//
-void TApListItemUidKey::SetPtr( CApListItemList* aPtr )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// TApListItemUidKey::Compare
-// ---------------------------------------------------------
-//
-TInt TApListItemUidKey::Compare( TInt aLeft,TInt aRight ) const
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// TApListItemUidKey::At
-// ---------------------------------------------------------
-//
-TAny* TApListItemUidKey::At( TInt anIndex ) const
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// TApListItemUidKey::TApListItemUidKey
-// ---------------------------------------------------------
-//
-TApListItemUidKey::TApListItemUidKey(  TBool aAscending )
-:TKeyArrayFix( 0, ECmpCollated )
-        {
-        }
-
-
-//  End of File
--- a/apengine/apeng/src/ApNetworkItem.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,144 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declaration of the CApNetworkItem class.
-*
-*/
-
-
-// INCLUDE FILES
-#include <eikdef.h>
-
-#include "ApNetworkItem.h"
-#include "ApEngineLogger.h"
-
-
-// LOCAL FUNCTION PROTOTYPES
-
-// ================= MEMBER FUNCTIONS =======================
-// Two-phased constructor.
-// ---------------------------------------------------------
-// CApNetworkItem::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApNetworkItem* CApNetworkItem::NewLC()
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CApNetworkItem::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApNetworkItem* CApNetworkItem::NewLC( CApNetworkItem* aItem )
-    {
-    return NULL;
-    }
-
-
-// Destructor
-// ---------------------------------------------------------
-// CApNetworkItem::~CApNetworkItem
-// ---------------------------------------------------------
-//
-EXPORT_C CApNetworkItem::~CApNetworkItem()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApNetworkItem::CopyFromL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApNetworkItem::CopyFromL( const CApNetworkItem& aCopyFrom )
-    {
-    }
-
-
-// C++ default constructor can NOT contain any code that
-// might leave.
-//
-// ---------------------------------------------------------
-// CApNetworkItem::CApNetworkItem
-// ---------------------------------------------------------
-//
-EXPORT_C CApNetworkItem::CApNetworkItem()
-:iUid( 0 )
-    {
-    }
-
-
-// Symbian OS default constructor can leave.
-// ---------------------------------------------------------
-// CApNetworkItem::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApNetworkItem::ConstructL()
-    {
-    }
-
-
-// Symbian OS default constructor can leave.
-// ---------------------------------------------------------
-// CApNetworkItem::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApNetworkItem::ConstructL( TUint32 aUid,
-                                          const TDesC& aName )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApNetworkItem::Name
-// ---------------------------------------------------------
-//
-EXPORT_C const TDesC& CApNetworkItem::Name() const
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApNetworkItem::Uid
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CApNetworkItem::Uid() const
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApNetworkItem::SetUid
-// ---------------------------------------------------------
-//
-EXPORT_C void CApNetworkItem::SetUid( TUint32 aUid )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApNetworkItem::SetUidL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApNetworkItem::SetNameL( const TDesC& aName )
-    {
-    }
-
-//  End of File
--- a/apengine/apeng/src/ApProtHandler.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,233 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the CApProtHandler class.
-*
-*/
-
-
-// INCLUDE FILES
-#include <cdbcols.h>
-#include <commdb.h>
-#include <ApEngineConsts.h>
-
-#include <comms-infras/commdb/protection/protectdb.h>
-#include <comms-infras/commdb/protection/protectcpdb.h>
-
-#include <ApProtHandler.h>
-#include <ApListItem.h>
-#include <ApListItemList.h>
-#include <ApDataHandler.h>
-#include <ApSelect.h>
-
-#include "ApEngineCommons.h"
-#include "APEngineVariant.hrh"
-#include "ApEngineLogger.h"
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CApProtHandler::IsTableProtectedL
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApProtHandler::IsTableProtectedL( CCommsDatabase* aDb )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApProtHandler::IsApProtectedL
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApProtHandler::IsApProtectedL( CCommsDatabase* aDb,
-                                                     TUint32 aUid )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApProtHandler::ProtectItemL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApProtHandler::ProtectItemL( CCommsDatabase* aDb,
-                                             TUint32 aUid )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApProtHandler::UnprotectItemL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApProtHandler::UnprotectItemL( CCommsDatabase* aDb,
-                                               TUint32 aUid )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApProtHandler::ProtectTableL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApProtHandler::ProtectTableL( CCommsDatabase* aDb )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApProtHandler::UnprotectTableL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApProtHandler::UnprotectTableL( CCommsDatabase* aDb )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApProtHandler::IsPreferencesProtectedL
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CApProtHandler::IsPreferencesProtectedL( CCommsDatabase* aDb )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApProtHandler::ProtectPreferencesL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApProtHandler::ProtectPreferencesL( CCommsDatabase* aDb )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApProtHandler::UnprotectPreferencesL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApProtHandler::UnprotectPreferencesL( CCommsDatabase* aDb )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApProtHandler::RemoveProtectedAccessPointsL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApProtHandler::RemoveProtectedAccessPointsL(
-                                          CCommsDatabase* aDb)
-    {
-    }
-
-// ================== OTHER MEMBER FUNCTIONS ===============
-
-
-
-
-
-// ---------------------------------------------------------
-// CApProtHandler::IsRecordProtectedL
-// ---------------------------------------------------------
-//
-TBool CApProtHandler::IsRecordProtectedL( CCommsDatabase* aDb,
-                                            const TDesC& aTable,
-                                            TUint32 aUid )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApProtHandler::ProtectRecordL
-// ---------------------------------------------------------
-//
-void CApProtHandler::ProtectRecordL( CCommsDatabase* aDb,
-                                    const TDesC& aTable, TUint32 aUid )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApProtHandler::UnprotectRecordL
-// ---------------------------------------------------------
-//
-void CApProtHandler::UnprotectRecordL( CCommsDatabase* aDb,
-                                      const TDesC& aTable, TUint32 aUid )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApProtHandler::IsTableProtectedL
-// ---------------------------------------------------------
-//
-TBool CApProtHandler::IsTableProtectedL( CCommsDatabase* aDb,
-                                               const TDesC& aTable )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApProtHandler::ProtectTableL
-// ---------------------------------------------------------
-//
-void CApProtHandler::ProtectTableL( CCommsDatabase* aDb,
-                                     const TDesC& aTable )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApProtHandler::UnprotectTableL
-// ---------------------------------------------------------
-//
-void CApProtHandler::UnprotectTableL( CCommsDatabase* aDb,
-                                       const TDesC& aTable )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApProtHandler::GetProtectionStateL
-// ---------------------------------------------------------
-//
-TBool CApProtHandler::GetProtectionStateL( CCommsDbTableView& aTable )
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApProtHandler::DoRemoveProtectedAccessPointsL
-// ---------------------------------------------------------
-//
-void CApProtHandler::DoRemoveProtectedAccessPointsL(
-                                          CCommsDatabase& aDb)
-    {
-    }
-
-
-//  End of File
--- a/apengine/apeng/src/VpnApEngine.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,390 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the CVpnApEngine class.
-*
-*/
-
-
-// INCLUDE FILES
-
-#include    "VpnApEngine.h"
-#include    "VpnApItem.h"
-#include    "ApEngineLogger.h"
-#include    "ApEngineConsts.h"
-#include    "ApEngineCommons.h"
-
-#include    <ApDataHandler.h>
-#include    <ApAccessPointItem.h>
-#include    <ApUtils.h>
-
-#include    <txtetext.h>
-
-#include    <vpnapi.h>
-#include    <vpnapidefs.h>
-
-
-// CONSTANTS
-_LIT( KVpnVirtualBearerName, "vpnbearer" );
-_LIT( KVpnVirtualBearerAgent, "vpnconnagt.agt" );
-_LIT( KVpnVirtualBearerNif, "tunnelnif" );
-_LIT( KDefProxyProtocolName, "http" );                      // required !
-_LIT( KDefWapGatewayIpAddress, "0.0.0.0" );
-
-
-
-// constatnts needed for the virtualbearer table
-const TInt KNoTimeout = -1;
-const TUint32 KLastSessionTimeout = 3;
-
-
-// ================= MEMBER FUNCTIONS =======================
-// ---------------------------------------------------------
-// CVpnApEngine::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CVpnApEngine* CVpnApEngine::NewLC( CCommsDatabase* aDb )
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::~CVpnApEngine
-// ---------------------------------------------------------
-//
-EXPORT_C CVpnApEngine::~CVpnApEngine()
-    {
-    }
-
-        
-// ---------------------------------------------------------
-// CVpnApEngine::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CVpnApEngine::ConstructL( CCommsDatabase* aDb )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::CVpnApEngine
-// ---------------------------------------------------------
-//
-EXPORT_C CVpnApEngine::CVpnApEngine()
-:iOwnDb( EFalse )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::CreateVpnApL
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CVpnApEngine::CreateVpnApL( CVpnApItem& aVpnApItem )
-    {
-    return 0;
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::CreateVpnL
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CVpnApEngine::CreateVpnApL(  TDesC& aName, 
-                                              TUint32 aIapId, 
-                                              TDesC& aPolicy, 
-                                              TDesC* aProxyServerAddress, 
-                                              TUint32 aProxyPort )
-    {
-    return 0;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::DeleteVpnL
-// ---------------------------------------------------------
-//
-EXPORT_C void CVpnApEngine::DeleteVpnL( TUint32 aVpnApId )
-    {
-    }
-
-
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::VpnDataL
-// ---------------------------------------------------------
-//
-EXPORT_C void CVpnApEngine::VpnDataL( TUint32 aUid, 
-                                      CVpnApItem& aVpnApItem )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::UpdateVpnDataL
-// ---------------------------------------------------------
-//
-EXPORT_C void CVpnApEngine::UpdateVpnDataL( CVpnApItem& aVpnApItem )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::IsVpnApL()
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CVpnApEngine::IsVpnApL( const TUint32 aUid )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::Cvt()
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CVpnApEngine::Cvt()
-    {
-    return KErrNone;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::DoCreateVpnApL
-// ---------------------------------------------------------
-//
-TUint32 CVpnApEngine::DoCreateVpnApL( TBool aIsNew, CVpnApItem& aVpnApItem )
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::WriteVpnDataL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::WriteVpnDataL( TBool aIsNew, CVpnApItem& aVpnApItem )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::CreateVirtBearerIfNeededL
-// ---------------------------------------------------------
-//
-TUint32 CVpnApEngine::CreateVirtBearerIfNeededL()
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::WriteVpnIapRecordL
-// ---------------------------------------------------------
-//
-TUint32 CVpnApEngine::WriteVpnIapRecordL( TBool aIsNew, 
-                                          CVpnApItem& aVpnApItem )
-    {
-    return 0;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::GetLocationIdL
-// ---------------------------------------------------------
-//
-TUint32 CVpnApEngine::GetLocationIdL()
-    {
-    return 0;    
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::WriteVpnWapApDataL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::WriteVpnWapApDataL( TBool aIsNew, CVpnApItem& aVpnApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::WriteWapBearerDataL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::WriteVpnWapBearerDataL( TBool aIsNew, 
-                                           CVpnApItem& aVpnApItem )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::ReadVpnWapBearerDataL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::ReadVpnWapBearerDataL( TUint32 aUid, 
-                                          CVpnApItem& aVpnApItem )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::ReadVpnWapApDataL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::ReadVpnWapApDataL( CVpnApItem& aVpnApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::ReadVpnIapRecordL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::ReadVpnIapRecordL( CVpnApItem& aVpnApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::ReadVpnDataL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::ReadVpnDataL( CVpnApItem& aVpnApItem )
-    {
-    }
-
-
-
-
-
-
-
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::WriteProxyDataL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::WriteProxyDataL( TBool aIsNew, 
-                                      const CVpnApItem& aVpnApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::ReadProxyDataL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::ReadProxyDataL( CVpnApItem& aVpnApItem )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::RemoveVpnProxyDataL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::RemoveVpnProxyDataL( TUint32 aIspId )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::DoDeleteVpnL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::DoDeleteVpnL( TUint32 aUid )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::RemoveRecordL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::RemoveRecordL( const TDesC& aTable, TUint32 aUid )
-    {
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::WriteNetworkDataL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::WriteNetworkDataL( TBool aIsNew, 
-                                        CVpnApItem& aVpnApItem )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::ReadNetworkDataL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::ReadNetworkDataL( CVpnApItem& aVpnApItem )
-    {    
-  }
-
-
-
-// ---------------------------------------------------------
-// CVpnApEngine::RemoveNetworkDataL
-// ---------------------------------------------------------
-//
-void CVpnApEngine::RemoveNetworkDataL( TUint32 aIspId )
-    {
-    }
-
-//  End of File
-
--- a/apengine/apeng/src/VpnApItem.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,267 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the CVpnApItem class.
-*
-*/
-
-
-// INCLUDE FILES
-
-#include    <f32file.h>
-#include    <bautils.h>
-#include    <barsc.h>
-#include    <apengine.rsg>
-#include    <txtetext.h>
-#include    <data_caging_path_literals.hrh>
-
-#include    "VpnApItem.h"
-#include    "ApEngineLogger.h"
-#include    "ApEngineConsts.h"
-#include    "ApEngineCommons.h"
-
-
-
-// CONSTANTS
-const TInt KApItemInitialTxtBufSize = 0;
-const TInt KVpnDefProxyPortNumber = 80;
-
-// DUPLCIATE as I can not touch original, but do need the file here, too...
-/// ROM drive.
-_LIT( KApEngineResDriveZ, "z:" );
-/// ApEngine resource file name.
-_LIT( KApEngineResFileName, "ApEngine.rsc" );
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-// ---------------------------------------------------------
-// CVpnApItem::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CVpnApItem* CVpnApItem::NewLC()
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CVpnApItem::~CVpnApItem
-// ---------------------------------------------------------
-//
-EXPORT_C CVpnApItem::~CVpnApItem()
-    {
-    }
-
-        
-// ---------------------------------------------------------
-// CVpnApItem::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CVpnApItem::ConstructL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CVpnApItem::CVpnApItem
-// ---------------------------------------------------------
-//
-EXPORT_C CVpnApItem::CVpnApItem()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApItem::CopyFromL
-// ---------------------------------------------------------
-//
-EXPORT_C void CVpnApItem::CopyFromL( const CVpnApItem& aCopyFrom  )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApItem::operator==
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CVpnApItem::operator==( const CVpnApItem& aItem ) const
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CVpnApItem::operator!=
-// ---------------------------------------------------------
-//
-EXPORT_C TBool CVpnApItem::operator!=( const CVpnApItem& aItem ) const
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApItem::ReadTextL
-// ---------------------------------------------------------
-//
-EXPORT_C void CVpnApItem::ReadTextL( const TVpnApMember aColumn, 
-                                     TDes16& aValue )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApItem::ReadConstLongTextL
-// ---------------------------------------------------------
-//
-EXPORT_C const HBufC* CVpnApItem::ReadConstLongTextL( 
-                                         const TVpnApMember aColumn 
-                                                    )
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CVpnApItem::ReadUint
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CVpnApItem::ReadUint( const TVpnApMember aColumn, 
-                                    TUint32& aValue )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApItem::ReadBool
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CVpnApItem::ReadBool( const TVpnApMember /*aColumn*/, 
-                                    TBool& /*aValue*/ )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CVpnApItem::WriteTextL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CVpnApItem::WriteTextL( const TVpnApMember aColumn,
-                                      const TDesC16& aValue )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApItem::WriteLongTextL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CVpnApItem::WriteLongTextL( const TVpnApMember aColumn,
-                                          const TDesC& aValue )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApItem::WriteUint
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CVpnApItem::WriteUint( const TVpnApMember aColumn,
-                                     const TUint32& aValue )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApItem::WriteBool
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CVpnApItem::WriteBool( const TVpnApMember /*aColumn*/,
-                                     const TBool& /*aValue*/ )
-    {
-    return KErrNotSupported;
-    }
-
-
-// Query
-// COMMON
-
-// ---------------------------------------------------------
-// CVpnApItem::WapUid
-// ---------------------------------------------------------
-//
-EXPORT_C TUint32 CVpnApItem::WapUid() const
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CVpnApItem::Name
-// ---------------------------------------------------------
-//
-EXPORT_C const TDesC& CVpnApItem::Name() const
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApItem::ReAllocL
-// ---------------------------------------------------------
-//
-void CVpnApItem::ReAllocL(HBufC*& aDes, const TDesC16& aValue)
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApItem::RemoveInvalidCharsLC
-// ---------------------------------------------------------
-//
-HBufC* CVpnApItem::RemoveInvalidCharsLC( const TDesC16& aInText )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CVpnApItem::HasProxy
-// ---------------------------------------------------------
-//
-TBool CVpnApItem::HasProxy() const
-    {
-    return EFalse;
-    }
-
-//  End of File
--- a/apengine/apeng/src/aplistitemlist.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,63 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declaration of the CApSelect class.
-*
-*/
-
-
-// INCLUDE FILES
-
-#include "ApListItemList.h"
-#include "ApListItem.h"
-#include "ApEngineLogger.h"
-
-
-// CONSTANTS
-
-LOCAL_D const TInt KGranularity = 4;    ///< Granularity of the list.
-
-// ================= MEMBER FUNCTIONS =======================
-
-// C++ default constructor can NOT contain any code that
-// might leave.
-//
-// ---------------------------------------------------------
-// CApListItemList::CApListItemList
-// ---------------------------------------------------------
-//
-EXPORT_C CApListItemList::CApListItemList()
-: CArrayPtrFlat<CApListItem>( KGranularity )
-    {
-    }
-
-// Destructor
-// ---------------------------------------------------------
-// CApListItemList::~CApListItemList
-// ---------------------------------------------------------
-//
-EXPORT_C CApListItemList::~CApListItemList()
-    {
-    }
-
-// ---------------------------------------------------------
-// CApListItemList::ItemByUid
-// ---------------------------------------------------------
-//
-EXPORT_C CApListItem* CApListItemList::ItemForUid( TUint32 aUid ) const
-    {
-    return NULL;
-    }
-
-//  End of File
--- a/apengine/apeng/src/apnetworkitemlist.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,65 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declaration of the CApNetworkItemList class.
-*
-*/
-
-
-// INCLUDE FILES
-
-#include "ApNetworkItemList.h"
-#include "ApNetworkItem.h"
-#include "ApEngineLogger.h"
-
-
-// CONSTANTS
-
-LOCAL_D const TInt KGranularity = 4;    ///< Granularity of the list.
-
-// ================= MEMBER FUNCTIONS =======================
-
-// C++ default constructor can NOT contain any code that
-// might leave.
-//
-// ---------------------------------------------------------
-// CApNetworkItemList::CApNetworkItemList
-// ---------------------------------------------------------
-//
-EXPORT_C CApNetworkItemList::CApNetworkItemList()
-: CArrayPtrFlat<CApNetworkItem>( KGranularity )
-    {
-    }
-
-// Destructor
-// ---------------------------------------------------------
-// CApNetworkItemList::~CApNetworkItemList
-// ---------------------------------------------------------
-//
-EXPORT_C CApNetworkItemList::~CApNetworkItemList()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApNetworkItemList::ItemForUid
-// ---------------------------------------------------------
-//
-EXPORT_C const CApNetworkItem* CApNetworkItemList::ItemForUid
-( TUint32 aUid ) const
-    {
-    return NULL;
-    }
-
-//  End of File
--- a/apengine/apsettingshandlerui/BMARM/APSETTINGSHANDLERUIU.DEF	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-EXPORTS
-	__18CApSettingsHandleri18TSelectionListType18TSelectionMenuType @ 1 NONAME ; CApSettingsHandler::CApSettingsHandler(int, TSelectionListType, TSelectionMenuType)
-	ConstructL__18CApSettingsHandleriii @ 2 NONAME ; CApSettingsHandler::ConstructL(int, int, int)
-	E32Dll__F10TDllReason @ 3 NONAME R3UNUSED ; E32Dll(TDllReason)
-	NewLC__18CApSettingsHandlerR11CActiveApDbi18TSelectionListType18TSelectionMenuTypeiii @ 4 NONAME ; CApSettingsHandler::NewLC(CActiveApDb &, int, TSelectionListType, TSelectionMenuType, int, int, int)
-	NewLC__18CApSettingsHandleri18TSelectionListType18TSelectionMenuTypeiii @ 5 NONAME ; CApSettingsHandler::NewLC(int, TSelectionListType, TSelectionMenuType, int, int, int)
-	RunSettingsL__18CApSettingsHandlerUlRUl @ 6 NONAME R3UNUSED ; CApSettingsHandler::RunSettingsL(unsigned long, unsigned long &)
-	RunViewerL__18CApSettingsHandlerUl @ 7 NONAME R3UNUSED ; CApSettingsHandler::RunViewerL(unsigned long)
-	SetFilterL__18CApSettingsHandleriii @ 8 NONAME ; CApSettingsHandler::SetFilterL(int, int, int)
-	SetTextOverrideL__18CApSettingsHandler7TTextIDRC7TDesC16 @ 9 NONAME R3UNUSED ; CApSettingsHandler::SetTextOverrideL(TTextID, TDesC16 const &)
-	TextOverrideL__18CApSettingsHandler7TTextID @ 10 NONAME R3UNUSED ; CApSettingsHandler::TextOverrideL(TTextID)
-	"_._18CApSettingsHandler" @ 11 NONAME R3UNUSED ; CApSettingsHandler::~CApSettingsHandler(void)
-	ConstructL__18CApSettingsHandlerR11CActiveApDbiii @ 12 NONAME ; CApSettingsHandler::ConstructL(CActiveApDb &, int, int, int)
-	Cvt__18CApSettingsHandler @ 13 NONAME R3UNUSED ; CApSettingsHandler::Cvt(void)
-	NewLC__18CApSettingsHandlerR11CActiveApDbi18TSelectionListType18TSelectionMenuTypeiiii @ 14 NONAME ; CApSettingsHandler::NewLC(CActiveApDb &, int, TSelectionListType, TSelectionMenuType, int, int, int, int)
-	NewLC__18CApSettingsHandleri18TSelectionListType18TSelectionMenuTypeiiii @ 15 NONAME ; CApSettingsHandler::NewLC(int, TSelectionListType, TSelectionMenuType, int, int, int, int)
-	ConstructL__18CApSettingsHandlerR11CActiveApDbiii14TVpnFilterType @ 16 NONAME ; CApSettingsHandler::ConstructL(CActiveApDb &, int, int, int, TVpnFilterType)
-	ConstructL__18CApSettingsHandleriii14TVpnFilterType @ 17 NONAME ; CApSettingsHandler::ConstructL(int, int, int, TVpnFilterType)
-	NewLC__18CApSettingsHandlerR11CActiveApDbi18TSelectionListType18TSelectionMenuTypeiiii14TVpnFilterType @ 18 NONAME ; CApSettingsHandler::NewLC(CActiveApDb &, int, TSelectionListType, TSelectionMenuType, int, int, int, int, TVpnFilterType)
-	NewLC__18CApSettingsHandleri18TSelectionListType18TSelectionMenuTypeiiii14TVpnFilterType @ 19 NONAME ; CApSettingsHandler::NewLC(int, TSelectionListType, TSelectionMenuType, int, int, int, int, TVpnFilterType)
-
--- a/apengine/apsettingshandlerui/BMARM/ApSettingsHandlerUI_EKA2U.def	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,20 +0,0 @@
-EXPORTS
-	__18CApSettingsHandleri18TSelectionListType18TSelectionMenuType @ 1 NONAME ; CApSettingsHandler::CApSettingsHandler(int, TSelectionListType, TSelectionMenuType)
-	ConstructL__18CApSettingsHandlerR11CActiveApDbiii14TVpnFilterType @ 2 NONAME ; CApSettingsHandler::ConstructL(CActiveApDb &, int, int, int, TVpnFilterType)
-	ConstructL__18CApSettingsHandleriii @ 3 NONAME ; CApSettingsHandler::ConstructL(int, int, int)
-	ConstructL__18CApSettingsHandleriii14TVpnFilterType @ 4 NONAME ; CApSettingsHandler::ConstructL(int, int, int, TVpnFilterType)
-	Cvt__18CApSettingsHandler @ 5 NONAME R3UNUSED ; CApSettingsHandler::Cvt(void)
-	NewLC__18CApSettingsHandlerR11CActiveApDbi18TSelectionListType18TSelectionMenuTypeiii @ 6 NONAME ; CApSettingsHandler::NewLC(CActiveApDb &, int, TSelectionListType, TSelectionMenuType, int, int, int)
-	NewLC__18CApSettingsHandlerR11CActiveApDbi18TSelectionListType18TSelectionMenuTypeiiii @ 7 NONAME ; CApSettingsHandler::NewLC(CActiveApDb &, int, TSelectionListType, TSelectionMenuType, int, int, int, int)
-	NewLC__18CApSettingsHandlerR11CActiveApDbi18TSelectionListType18TSelectionMenuTypeiiii14TVpnFilterType @ 8 NONAME ; CApSettingsHandler::NewLC(CActiveApDb &, int, TSelectionListType, TSelectionMenuType, int, int, int, int, TVpnFilterType)
-	NewLC__18CApSettingsHandleri18TSelectionListType18TSelectionMenuTypeiii @ 9 NONAME ; CApSettingsHandler::NewLC(int, TSelectionListType, TSelectionMenuType, int, int, int)
-	NewLC__18CApSettingsHandleri18TSelectionListType18TSelectionMenuTypeiiii @ 10 NONAME ; CApSettingsHandler::NewLC(int, TSelectionListType, TSelectionMenuType, int, int, int, int)
-	NewLC__18CApSettingsHandleri18TSelectionListType18TSelectionMenuTypeiiii14TVpnFilterType @ 11 NONAME ; CApSettingsHandler::NewLC(int, TSelectionListType, TSelectionMenuType, int, int, int, int, TVpnFilterType)
-	RunSettingsL__18CApSettingsHandlerUlRUl @ 12 NONAME R3UNUSED ; CApSettingsHandler::RunSettingsL(unsigned long, unsigned long &)
-	RunViewerL__18CApSettingsHandlerUl @ 13 NONAME R3UNUSED ; CApSettingsHandler::RunViewerL(unsigned long)
-	SetFilterL__18CApSettingsHandleriii @ 14 NONAME ; CApSettingsHandler::SetFilterL(int, int, int)
-	SetTextOverrideL__18CApSettingsHandler7TTextIDRC7TDesC16 @ 15 NONAME R3UNUSED ; CApSettingsHandler::SetTextOverrideL(TTextID, TDesC16 const &)
-	TextOverrideL__18CApSettingsHandler7TTextID @ 16 NONAME R3UNUSED ; CApSettingsHandler::TextOverrideL(TTextID)
-	"_._18CApSettingsHandler" @ 17 NONAME R3UNUSED ; CApSettingsHandler::~CApSettingsHandler(void)
-	ConstructL__18CApSettingsHandlerR11CActiveApDbiii @ 18 NONAME ; CApSettingsHandler::ConstructL(CActiveApDb &, int, int, int)
-
--- a/apengine/apsettingshandlerui/BWINS/APSETTINGSHANDLERUIU.DEF	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-EXPORTS
-	??0CApSettingsHandler@@IAE@HW4TSelectionListType@@W4TSelectionMenuType@@@Z @ 1 NONAME ; protected: __thiscall CApSettingsHandler::CApSettingsHandler(int,enum TSelectionListType,enum TSelectionMenuType)
-	??1CApSettingsHandler@@UAE@XZ @ 2 NONAME ; public: virtual __thiscall CApSettingsHandler::~CApSettingsHandler(void)
-	?ConstructL@CApSettingsHandler@@IAEXHHH@Z @ 3 NONAME ; protected: void __thiscall CApSettingsHandler::ConstructL(int,int,int)
-	?E32Dll@@YAHW4TDllReason@@@Z @ 4 NONAME ; int __cdecl E32Dll(enum TDllReason)
-	?NewLC@CApSettingsHandler@@SAPAV1@HW4TSelectionListType@@W4TSelectionMenuType@@HHH@Z @ 5 NONAME ; public: static class CApSettingsHandler * __cdecl CApSettingsHandler::NewLC(int,enum TSelectionListType,enum TSelectionMenuType,int,int,int)
-	?RunSettingsL@CApSettingsHandler@@QAEHKAAK@Z @ 6 NONAME ; public: int __thiscall CApSettingsHandler::RunSettingsL(unsigned long,unsigned long &)
-	?RunViewerL@CApSettingsHandler@@IAEHK@Z @ 7 NONAME ; protected: int __thiscall CApSettingsHandler::RunViewerL(unsigned long)
-	?SetFilterL@CApSettingsHandler@@QAEXHHH@Z @ 8 NONAME ; public: void __thiscall CApSettingsHandler::SetFilterL(int,int,int)
-	?SetTextOverrideL@CApSettingsHandler@@QAEXW4TTextID@@ABVTDesC16@@@Z @ 9 NONAME ; public: void __thiscall CApSettingsHandler::SetTextOverrideL(enum TTextID,class TDesC16 const &)
-	?TextOverrideL@CApSettingsHandler@@QAEABVTDesC16@@W4TTextID@@@Z @ 10 NONAME ; public: class TDesC16 const & __thiscall CApSettingsHandler::TextOverrideL(enum TTextID)
-	?ConstructL@CApSettingsHandler@@IAEXAAVCActiveApDb@@HHH@Z @ 11 NONAME ; protected: void __thiscall CApSettingsHandler::ConstructL(class CActiveApDb &,int,int,int)
-	?NewLC@CApSettingsHandler@@SAPAV1@AAVCActiveApDb@@HW4TSelectionListType@@W4TSelectionMenuType@@HHH@Z @ 12 NONAME ; public: static class CApSettingsHandler * __cdecl CApSettingsHandler::NewLC(class CActiveApDb &,int,enum TSelectionListType,enum TSelectionMenuType,int,int,int)
-	?Cvt@CApSettingsHandler@@SAHXZ @ 13 NONAME ; public: static int __cdecl CApSettingsHandler::Cvt(void)
-	?NewLC@CApSettingsHandler@@SAPAV1@AAVCActiveApDb@@HW4TSelectionListType@@W4TSelectionMenuType@@HHHH@Z @ 14 NONAME ; public: static class CApSettingsHandler * __cdecl CApSettingsHandler::NewLC(class CActiveApDb &,int,enum TSelectionListType,enum TSelectionMenuType,int,int,int,int)
-	?NewLC@CApSettingsHandler@@SAPAV1@HW4TSelectionListType@@W4TSelectionMenuType@@HHHH@Z @ 15 NONAME ; public: static class CApSettingsHandler * __cdecl CApSettingsHandler::NewLC(int,enum TSelectionListType,enum TSelectionMenuType,int,int,int,int)
-	?ConstructL@CApSettingsHandler@@IAEXAAVCActiveApDb@@HHHW4TVpnFilterType@@@Z @ 16 NONAME ; protected: void __thiscall CApSettingsHandler::ConstructL(class CActiveApDb &,int,int,int,enum TVpnFilterType)
-	?ConstructL@CApSettingsHandler@@IAEXHHHW4TVpnFilterType@@@Z @ 17 NONAME ; protected: void __thiscall CApSettingsHandler::ConstructL(int,int,int,enum TVpnFilterType)
-	?NewLC@CApSettingsHandler@@SAPAV1@AAVCActiveApDb@@HW4TSelectionListType@@W4TSelectionMenuType@@HHHHW4TVpnFilterType@@@Z @ 18 NONAME ; public: static class CApSettingsHandler * __cdecl CApSettingsHandler::NewLC(class CActiveApDb &,int,enum TSelectionListType,enum TSelectionMenuType,int,int,int,int,enum TVpnFilterType)
-	?NewLC@CApSettingsHandler@@SAPAV1@HW4TSelectionListType@@W4TSelectionMenuType@@HHHHW4TVpnFilterType@@@Z @ 19 NONAME ; public: static class CApSettingsHandler * __cdecl CApSettingsHandler::NewLC(int,enum TSelectionListType,enum TSelectionMenuType,int,int,int,int,enum TVpnFilterType)
-
--- a/apengine/apsettingshandlerui/BWinsCw/APSETTINGSHANDLERUIU.DEF	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,21 +0,0 @@
-EXPORTS
-	??0CApSettingsHandler@@IAE@HW4TSelectionListType@@W4TSelectionMenuType@@@Z @ 1 NONAME ; CApSettingsHandler::CApSettingsHandler(int, enum TSelectionListType, enum TSelectionMenuType)
-	??1CApSettingsHandler@@UAE@XZ @ 2 NONAME ; CApSettingsHandler::~CApSettingsHandler(void)
-	?ConstructL@CApSettingsHandler@@IAEXAAVCActiveApDb@@HHH@Z @ 3 NONAME ; void CApSettingsHandler::ConstructL(class CActiveApDb &, int, int, int)
-	?ConstructL@CApSettingsHandler@@IAEXAAVCActiveApDb@@HHHW4TVpnFilterType@@@Z @ 4 NONAME ; void CApSettingsHandler::ConstructL(class CActiveApDb &, int, int, int, enum TVpnFilterType)
-	?ConstructL@CApSettingsHandler@@IAEXHHH@Z @ 5 NONAME ; void CApSettingsHandler::ConstructL(int, int, int)
-	?ConstructL@CApSettingsHandler@@IAEXHHHW4TVpnFilterType@@@Z @ 6 NONAME ; void CApSettingsHandler::ConstructL(int, int, int, enum TVpnFilterType)
-	?Cvt@CApSettingsHandler@@SAHXZ @ 7 NONAME ; int CApSettingsHandler::Cvt(void)
-	?E32Dll@@YAHW4TDllReason@@@Z @ 8 NONAME ; int E32Dll(enum TDllReason)
-	?NewLC@CApSettingsHandler@@SAPAV1@AAVCActiveApDb@@HW4TSelectionListType@@W4TSelectionMenuType@@HHH@Z @ 9 NONAME ; class CApSettingsHandler * CApSettingsHandler::NewLC(class CActiveApDb &, int, enum TSelectionListType, enum TSelectionMenuType, int, int, int)
-	?NewLC@CApSettingsHandler@@SAPAV1@AAVCActiveApDb@@HW4TSelectionListType@@W4TSelectionMenuType@@HHHH@Z @ 10 NONAME ; class CApSettingsHandler * CApSettingsHandler::NewLC(class CActiveApDb &, int, enum TSelectionListType, enum TSelectionMenuType, int, int, int, int)
-	?NewLC@CApSettingsHandler@@SAPAV1@AAVCActiveApDb@@HW4TSelectionListType@@W4TSelectionMenuType@@HHHHW4TVpnFilterType@@@Z @ 11 NONAME ; class CApSettingsHandler * CApSettingsHandler::NewLC(class CActiveApDb &, int, enum TSelectionListType, enum TSelectionMenuType, int, int, int, int, enum TVpnFilterType)
-	?NewLC@CApSettingsHandler@@SAPAV1@HW4TSelectionListType@@W4TSelectionMenuType@@HHH@Z @ 12 NONAME ; class CApSettingsHandler * CApSettingsHandler::NewLC(int, enum TSelectionListType, enum TSelectionMenuType, int, int, int)
-	?NewLC@CApSettingsHandler@@SAPAV1@HW4TSelectionListType@@W4TSelectionMenuType@@HHHH@Z @ 13 NONAME ; class CApSettingsHandler * CApSettingsHandler::NewLC(int, enum TSelectionListType, enum TSelectionMenuType, int, int, int, int)
-	?NewLC@CApSettingsHandler@@SAPAV1@HW4TSelectionListType@@W4TSelectionMenuType@@HHHHW4TVpnFilterType@@@Z @ 14 NONAME ; class CApSettingsHandler * CApSettingsHandler::NewLC(int, enum TSelectionListType, enum TSelectionMenuType, int, int, int, int, enum TVpnFilterType)
-	?RunSettingsL@CApSettingsHandler@@QAEHKAAK@Z @ 15 NONAME ; int CApSettingsHandler::RunSettingsL(unsigned long, unsigned long &)
-	?RunViewerL@CApSettingsHandler@@IAEHK@Z @ 16 NONAME ; int CApSettingsHandler::RunViewerL(unsigned long)
-	?SetFilterL@CApSettingsHandler@@QAEXHHH@Z @ 17 NONAME ; void CApSettingsHandler::SetFilterL(int, int, int)
-	?SetTextOverrideL@CApSettingsHandler@@QAEXW4TTextID@@ABVTDesC16@@@Z @ 18 NONAME ; void CApSettingsHandler::SetTextOverrideL(enum TTextID, class TDesC16 const &)
-	?TextOverrideL@CApSettingsHandler@@QAEABVTDesC16@@W4TTextID@@@Z @ 19 NONAME ; class TDesC16 const & CApSettingsHandler::TextOverrideL(enum TTextID)
-
--- a/apengine/apsettingshandlerui/BWinsCw/ApSettingsHandlerUI_EKA2U.def	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-EXPORTS
-	??0CApSettingsHandler@@IAE@HW4TSelectionListType@@W4TSelectionMenuType@@@Z @ 1 NONAME ; CApSettingsHandler::CApSettingsHandler(int, enum TSelectionListType, enum TSelectionMenuType)
-	??1CApSettingsHandler@@UAE@XZ @ 2 NONAME ; CApSettingsHandler::~CApSettingsHandler(void)
-	?ConstructL@CApSettingsHandler@@IAEXAAVCActiveApDb@@HHH@Z @ 3 NONAME ; void CApSettingsHandler::ConstructL(class CActiveApDb &, int, int, int)
-	?ConstructL@CApSettingsHandler@@IAEXAAVCActiveApDb@@HHHW4TVpnFilterType@@@Z @ 4 NONAME ; void CApSettingsHandler::ConstructL(class CActiveApDb &, int, int, int, enum TVpnFilterType)
-	?ConstructL@CApSettingsHandler@@IAEXHHH@Z @ 5 NONAME ; void CApSettingsHandler::ConstructL(int, int, int)
-	?ConstructL@CApSettingsHandler@@IAEXHHHW4TVpnFilterType@@@Z @ 6 NONAME ; void CApSettingsHandler::ConstructL(int, int, int, enum TVpnFilterType)
-	?Cvt@CApSettingsHandler@@SAHXZ @ 7 NONAME ; int CApSettingsHandler::Cvt(void)
-	?NewLC@CApSettingsHandler@@SAPAV1@AAVCActiveApDb@@HW4TSelectionListType@@W4TSelectionMenuType@@HHH@Z @ 8 NONAME ; class CApSettingsHandler * CApSettingsHandler::NewLC(class CActiveApDb &, int, enum TSelectionListType, enum TSelectionMenuType, int, int, int)
-	?NewLC@CApSettingsHandler@@SAPAV1@AAVCActiveApDb@@HW4TSelectionListType@@W4TSelectionMenuType@@HHHH@Z @ 9 NONAME ; class CApSettingsHandler * CApSettingsHandler::NewLC(class CActiveApDb &, int, enum TSelectionListType, enum TSelectionMenuType, int, int, int, int)
-	?NewLC@CApSettingsHandler@@SAPAV1@AAVCActiveApDb@@HW4TSelectionListType@@W4TSelectionMenuType@@HHHHW4TVpnFilterType@@@Z @ 10 NONAME ; class CApSettingsHandler * CApSettingsHandler::NewLC(class CActiveApDb &, int, enum TSelectionListType, enum TSelectionMenuType, int, int, int, int, enum TVpnFilterType)
-	?NewLC@CApSettingsHandler@@SAPAV1@HW4TSelectionListType@@W4TSelectionMenuType@@HHH@Z @ 11 NONAME ; class CApSettingsHandler * CApSettingsHandler::NewLC(int, enum TSelectionListType, enum TSelectionMenuType, int, int, int)
-	?NewLC@CApSettingsHandler@@SAPAV1@HW4TSelectionListType@@W4TSelectionMenuType@@HHHH@Z @ 12 NONAME ; class CApSettingsHandler * CApSettingsHandler::NewLC(int, enum TSelectionListType, enum TSelectionMenuType, int, int, int, int)
-	?NewLC@CApSettingsHandler@@SAPAV1@HW4TSelectionListType@@W4TSelectionMenuType@@HHHHW4TVpnFilterType@@@Z @ 13 NONAME ; class CApSettingsHandler * CApSettingsHandler::NewLC(int, enum TSelectionListType, enum TSelectionMenuType, int, int, int, int, enum TVpnFilterType)
-	?RunSettingsL@CApSettingsHandler@@QAEHKAAK@Z @ 14 NONAME ; int CApSettingsHandler::RunSettingsL(unsigned long, unsigned long &)
-	?RunViewerL@CApSettingsHandler@@IAEHK@Z @ 15 NONAME ; int CApSettingsHandler::RunViewerL(unsigned long)
-	?SetFilterL@CApSettingsHandler@@QAEXHHH@Z @ 16 NONAME ; void CApSettingsHandler::SetFilterL(int, int, int)
-	?SetTextOverrideL@CApSettingsHandler@@QAEXW4TTextID@@ABVTDesC16@@@Z @ 17 NONAME ; void CApSettingsHandler::SetTextOverrideL(enum TTextID, class TDesC16 const &)
-	?TextOverrideL@CApSettingsHandler@@QAEABVTDesC16@@W4TTextID@@@Z @ 18 NONAME ; class TDesC16 const & CApSettingsHandler::TextOverrideL(enum TTextID)
-	?ConstructL@CApSettingsHandler@@IAEXAAVCActiveApDb@@HHHW4TVpnFilterType@@H@Z @ 19 NONAME ; void CApSettingsHandler::ConstructL(class CActiveApDb &, int, int, int, enum TVpnFilterType, int)
-	?NewLC@CApSettingsHandler@@SAPAV1@AAVCActiveApDb@@HW4TSelectionListType@@W4TSelectionMenuType@@HHHHW4TVpnFilterType@@H@Z @ 20 NONAME ; class CApSettingsHandler * CApSettingsHandler::NewLC(class CActiveApDb &, int, enum TSelectionListType, enum TSelectionMenuType, int, int, int, int, enum TVpnFilterType, int)
-	??1CApSettingsUi@@UAE@XZ @ 21 NONAME ; CApSettingsUi::~CApSettingsUi(void)
-	?ConstructL@CApSettingsUi@@IAEXHHHW4TVpnFilterType@@@Z @ 22 NONAME ; void CApSettingsUi::ConstructL(int, int, int, enum TVpnFilterType)
-	?NewLC@CApSettingsUi@@SAPAV1@HW4TSelectionListType@@W4TSelectionMenuType@@HHHHW4TVpnFilterType@@@Z @ 23 NONAME ; class CApSettingsUi * CApSettingsUi::NewLC(int, enum TSelectionListType, enum TSelectionMenuType, int, int, int, int, enum TVpnFilterType)
-	?RunSettingsL@CApSettingsUi@@QAEHKAAK@Z @ 24 NONAME ; int CApSettingsUi::RunSettingsL(unsigned long, unsigned long &)
-
Binary file apengine/apsettingshandlerui/Doc/S60_Access_Point_Settings_UI_Design_C.doc has changed
--- a/apengine/apsettingshandlerui/EABI/ApSettingsHandlerUI_EKA2U.def	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,35 +0,0 @@
-EXPORTS
-	_ZN18CApSettingsHandler10ConstructLER11CActiveApDbiii @ 1 NONAME
-	_ZN18CApSettingsHandler10ConstructLER11CActiveApDbiii14TVpnFilterType @ 2 NONAME
-	_ZN18CApSettingsHandler10ConstructLEiii @ 3 NONAME
-	_ZN18CApSettingsHandler10ConstructLEiii14TVpnFilterType @ 4 NONAME
-	_ZN18CApSettingsHandler10RunViewerLEm @ 5 NONAME
-	_ZN18CApSettingsHandler10SetFilterLEiii @ 6 NONAME
-	_ZN18CApSettingsHandler12RunSettingsLEmRm @ 7 NONAME
-	_ZN18CApSettingsHandler13TextOverrideLE7TTextID @ 8 NONAME
-	_ZN18CApSettingsHandler16SetTextOverrideLE7TTextIDRK7TDesC16 @ 9 NONAME
-	_ZN18CApSettingsHandler3CvtEv @ 10 NONAME
-	_ZN18CApSettingsHandler5NewLCER11CActiveApDbi18TSelectionListType18TSelectionMenuTypeiii @ 11 NONAME
-	_ZN18CApSettingsHandler5NewLCER11CActiveApDbi18TSelectionListType18TSelectionMenuTypeiiii @ 12 NONAME
-	_ZN18CApSettingsHandler5NewLCER11CActiveApDbi18TSelectionListType18TSelectionMenuTypeiiii14TVpnFilterType @ 13 NONAME
-	_ZN18CApSettingsHandler5NewLCEi18TSelectionListType18TSelectionMenuTypeiii @ 14 NONAME
-	_ZN18CApSettingsHandler5NewLCEi18TSelectionListType18TSelectionMenuTypeiiii @ 15 NONAME
-	_ZN18CApSettingsHandler5NewLCEi18TSelectionListType18TSelectionMenuTypeiiii14TVpnFilterType @ 16 NONAME
-	_ZN18CApSettingsHandlerC1Ei18TSelectionListType18TSelectionMenuType @ 17 NONAME
-	_ZN18CApSettingsHandlerC2Ei18TSelectionListType18TSelectionMenuType @ 18 NONAME
-	_ZN18CApSettingsHandlerD0Ev @ 19 NONAME
-	_ZN18CApSettingsHandlerD1Ev @ 20 NONAME
-	_ZN18CApSettingsHandlerD2Ev @ 21 NONAME
-	_ZTI18CApSettingsHandler @ 22 NONAME ; #<TI>#
-	_ZTV18CApSettingsHandler @ 23 NONAME ; #<VT>#
-	_ZN18CApSettingsHandler10ConstructLER11CActiveApDbiii14TVpnFilterTypei @ 24 NONAME
-	_ZN18CApSettingsHandler5NewLCER11CActiveApDbi18TSelectionListType18TSelectionMenuTypeiiii14TVpnFilterTypei @ 25 NONAME
-	_ZN13CApSettingsUi10ConstructLEiii14TVpnFilterType @ 26 NONAME
-	_ZN13CApSettingsUi12RunSettingsLEmRm @ 27 NONAME
-	_ZN13CApSettingsUi5NewLCEi18TSelectionListType18TSelectionMenuTypeiiii14TVpnFilterType @ 28 NONAME
-	_ZN13CApSettingsUiD0Ev @ 29 NONAME
-	_ZN13CApSettingsUiD1Ev @ 30 NONAME
-	_ZN13CApSettingsUiD2Ev @ 31 NONAME
-	_ZTI13CApSettingsUi @ 32 NONAME ; #<TI>#
-	_ZTV13CApSettingsUi @ 33 NONAME ; #<VT>#
-
--- a/apengine/apsettingshandlerui/Rom/ApSettingsHandlerUI.iby	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,24 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __APSETTINGSHANDLERUI_IBY__
-#define __APSETTINGSHANDLERUI_IBY__
-
-FILE=ABI_DIR\BUILD_DIR\ApSettingsHandlerUi.dll    SHARED_LIB_DIR\ApSettingsHandlerUi.dll
-SCALABLE_IMAGE(APP_BITMAP_DIR,APP_BITMAP_DIR,ApSettings)
-
-#endif
--- a/apengine/apsettingshandlerui/Rom/ApSettingsHandlerUIResources.iby	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,23 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-
-#ifndef __APSETTINGSHANDLERUIRESOURCE_IBY__
-#define __APSETTINGSHANDLERUIRESOURCE_IBY__
-
-DATA=DATAZ_\RESOURCE_FILES_DIR\ApSetUi.rsc	RESOURCE_FILES_DIR\ApSetUi.rsc
-
-#endif
--- a/apengine/apsettingshandlerui/data/apsetui.rss	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1642 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     This file contains all the resources for the ApSettings UI.
-*
-*/
-
-
-//  RESOURCE IDENTIFIER
-NAME    ASUI // 4 letter ID
-
-//  INCLUDES
-#include    <data_caging_paths_strings.hrh>
-
-#include <eikon.rh>
-#include <avkon.loc>
-#include <avkon.rsg>
-#include <avkon.rh>
-#include <avkon.mbg>
-#include <AvkonIcons.hrh>
-#include "ApSettingsHandlerUI.hrh"
-#include <apsettingshandlerui.loc>
-#include "ApSettingsHandlerConsts.h"
-#include "eikon.rsg"
-//#include <eikon.mbg>
-#include <uikon.rh>
-#include <apsettings.mbg>
-
-
-
-//For Ip address editor
-#define IPADDRESS_MIN_FIRST_FIELD_VALUE     0
-#define IPADDRESS_MIN_SECOND_FIELD_VALUE    0
-#define IPADDRESS_MIN_THIRD_FIELD_VALUE     0
-#define IPADDRESS_MIN_FOURTH_FIELD_VALUE    0
-#define IPADDRESS_MAX_FIRST_FIELD_VALUE     255
-#define IPADDRESS_MAX_SECOND_FIELD_VALUE    255
-#define IPADDRESS_MAX_THIRD_FIELD_VALUE     255
-#define IPADDRESS_MAX_FOURTH_FIELD_VALUE    255
-
-//  RESOURCE DEFINITIONS
-
-RESOURCE RSS_SIGNATURE { }
-
-RESOURCE TBUF { buf="ApSettingsHandlerUI"; }
-
-
-
-//----------------------------------------------------
-//
-//    r_apsettingsui_select_only_menubar
-//
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_apsettingsui_select_only_menubar
-    {
-    titles=
-        {
-        MENU_TITLE { menu_pane=r_apsettingsui_menu_select_only; txt="A"; }
-        };
-    }
-
-//----------------------------------------------------
-//
-//    r_apsettingsui_select_normal_menubar
-//
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_apsettingsui_select_normal_menubar
-    {
-    titles=
-        {
-        MENU_TITLE { menu_pane=r_apsettingsui_menu_select_normal; txt="A"; }
-        };
-    }
-
-
-
-//----------------------------------------------------
-//
-//    r_apsettingsui_normal_menubar
-//
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_apsettingsui_normal_menubar
-    {
-    titles=
-        {
-        MENU_TITLE { menu_pane=r_apsettingsui_menu_normal; txt="A"; }
-        };
-    }
-
-
-
-
-//----------------------------------------------------
-//
-//    r_apsettings_menubar
-//
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_apsettings_menubar
-    {
-    titles=
-        {
-        MENU_TITLE { menu_pane=r_apsettings_menu; txt="A"; }
-        };
-    }
-
-
-
-//----------------------------------------------------
-//
-//    r_apsettingsui_menu_select_only
-//
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_apsettingsui_menu_select_only
-    {
-    items=
-        {
-        MENU_ITEM { command=EApSelCmdSelect; txt= qtn_set_cmd_select; flags = EEikMenuItemAction; }
-        };
-    }
-
-
-//----------------------------------------------------
-//
-//    r_apsettingsui_menu_select_normal
-//
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_apsettingsui_menu_select_normal
-    {
-    items=
-        {
-        MENU_ITEM { command=EApSelCmdSelect; txt= qtn_set_cmd_select; flags = EEikMenuItemAction; },
-        MENU_ITEM { command=EApSelCmdOpen; txt= qtn_set_cmd_edit_ap; flags = EEikMenuItemAction;},
-        MENU_ITEM { command=EApSelCmdNewBlank; txt= qtn_set_cmd_new_ap; }, 
-        MENU_ITEM { command=EApSelCmdDelete; txt= qtn_set_cmd_del_ap; flags = EEikMenuItemSpecific; },
-        MENU_ITEM { command=EApSelCmdNewUseExisting; txt= qtn_netw_options_duplicate_iap; flags = EEikMenuItemSpecific;},
-        MENU_ITEM { command=EAknCmdHelp; txt= qtn_set_options_help; },
-        MENU_ITEM { command=EApSelCmdExit; txt= qtn_set_options_exit; }
-        };
-    }
-
-
-//----------------------------------------------------
-//
-//    r_apsettingsui_menu_normal
-//
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_apsettingsui_menu_normal
-    {
-    items=
-        {
-        MENU_ITEM { command=EApSelCmdOpen; txt= qtn_set_cmd_edit_ap; flags = EEikMenuItemAction;},
-        MENU_ITEM { command=EApSelCmdNewBlank; txt= qtn_set_cmd_new_ap; }, 
-        MENU_ITEM { command=EApSelCmdDelete; txt= qtn_set_cmd_del_ap; flags = EEikMenuItemSpecific;},
-        MENU_ITEM { command=EApSelCmdNewUseExisting; txt= qtn_netw_options_duplicate_iap; flags = EEikMenuItemSpecific;},
-        MENU_ITEM { command=EAknCmdHelp; txt= qtn_set_options_help; },
-        MENU_ITEM { command=EApSelCmdExit; txt= qtn_set_options_exit; }
-        };
-    }
-
-
-
-
-
-//----------------------------------------------------
-//
-//    r_apsettings_menu
-//
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_apsettings_menu
-    {
-    items=
-        {
-        MENU_ITEM { command=EApSelCmdChange; txt= qtn_set_options_change; flags = EEikMenuItemAction;},
-        MENU_ITEM { command=EApSelCmdAdvanced; txt= qtn_set_options_ap_advanced; flags = EEikMenuItemSpecific;},
-        MENU_ITEM { command=EAknCmdHelp; txt= qtn_set_options_help; },
-        MENU_ITEM { command=EApSelCmdExit; txt= qtn_set_options_exit; }
-        };
-    }
-
-
-
-//----------------------------------------------------
-//
-//    r_apselector_pane_softkeys_options_back_edit
-//
-//
-//----------------------------------------------------
-//
-RESOURCE CBA r_apselector_pane_softkeys_options_back_edit
-    {
-    buttons =
-        {
-        CBA_BUTTON {id=EAknSoftkeyOptions; txt = text_softkey_option;},
-        CBA_BUTTON {id=EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON {id=EApSelCmdOpen; txt = qtn_msk_edit;}
-        };
-    }
-
-//----------------------------------------------------
-//
-//    r_apselector_pane_dialog
-//
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_apselector_pane_dialog
-    {
-
-    flags=  EEikDialogFlagWait | EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-            EEikDialogFlagFillAppClientRect |
-            EEikDialogFlagCbaButtons;
-    buttons=r_apselector_pane_softkeys_options_back_edit;
-    items=
-        {
-        DLG_LINE
-            {
-            type = KApSelectorListboxType;
-            id = KApSelectorListboxId;
-            control= LISTBOX { flags = EAknListBoxSelectionList; };
-            }
-        };
-    }
-
-
-//----------------------------------------------------
-//
-//    r_apselector_popup_dialog
-//
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_apselector_popup_dialog
-    {
-
-    flags=EEikDialogFlagWait | EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-          EEikDialogFlagCbaButtons;
-    buttons=r_apselector_pane_softkeys_options_back_edit;
-    items=
-        {
-        DLG_LINE
-            {
-            type = KApSelectorListboxType;
-            id = KApSelectorListboxId;
-            control= LISTBOX { flags = EAknListBoxSelectionList; width = 60; height = 4;};
-            }
-        };
-    }
-
-//----------------------------------------------------
-//
-//    r_apsettings_softkeys_options_back_change
-//
-//
-//----------------------------------------------------
-//
-RESOURCE CBA r_apsettings_softkeys_options_back_change
-    {
-    buttons =
-        {
-        CBA_BUTTON {id=EAknSoftkeyOptions; txt = text_softkey_option;},
-        CBA_BUTTON {id=EAknSoftkeyBack; txt = text_softkey_back; },
-        CBA_BUTTON {id=EApSelCmdQuickChange; txt = qtn_msk_change;}
-        };
-    }
-    
-//----------------------------------------------------
-//
-//    r_apsettings_dialog
-//
-//
-//----------------------------------------------------
-//
-RESOURCE DIALOG r_apsettings_dialog
-    {
-    flags=EEikDialogFlagWait | EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-          EEikDialogFlagFillAppClientRect |
-          EEikDialogFlagCbaButtons;
-
-    buttons=r_apsettings_softkeys_options_back_change;
-    items=
-        {
-        DLG_LINE
-            {
-            type = EAknCtSettingListBox;
-            id = KApSettingsListboxId;
-            control= LISTBOX { flags = EEikListBoxMultipleSelection;};
-            }
-        };
-    }
-
-
-
-RESOURCE LISTBOX r_listbox_ap_settings
-    {
-    flags = EEikListBoxMultipleSelection;
-    }
-
-
-
-
-
-
-
-RESOURCE DIALOG r_confirmation_query
-    {
-    flags=EGeneralQueryFlags;
-    buttons=R_AVKON_SOFTKEYS_YES_NO__YES;
-     items=
-        {
-        DLG_LINE
-            {
-            type=EAknCtQuery;
-            id=EGeneralQuery;
-            control= AVKON_CONFIRMATION_QUERY
-                {
-                    layout = EConfirmationLayout;
-                };
-            }
-        };
-    }
-
-
-RESOURCE DIALOG r_general_note
-    {
-    flags=EEikDialogFlagNoDrag | EEikDialogFlagNoTitleBar |
-          EEikDialogFlagCbaButtons | EEikDialogFlagWait;
-    buttons=R_AVKON_SOFTKEYS_EMPTY;
-    items=
-        {
-        DLG_LINE
-            {
-            type=EAknCtNote;
-            id = EGeneralNote;
-            control= AVKON_NOTE
-                {
-                layout = EGeneralLayout;
-                singular_label = "";
-                plural_label = "";
-                animation = R_QGN_NOTE_INFO_ANIM;
-                };
-            }
-        };
-    }
-
- 
-// Ap data editor resources
-// Connection name
-RESOURCE EDWIN r_setting_app_edwin_conn_name
-    {
-    width=KConnNameWidth;
-    lines=KConnNameLines;
-    maxlength=KMaxConnNameLength;
-    allowed_input_modes = EAknEditorTextInputMode | EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorTextInputMode;
-    flags= EEikEdwinAutoSelection | EEikEdwinNoLineOrParaBreaks;
-    }
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_conn_name
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_ap_conn_name;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_conn_name;
-    }
-
-
-
-// GprsAccessPointName
-RESOURCE EDWIN r_setting_app_edwin_gprsap_name
-    {
-    width=KGprsApNameWidth;
-    lines=KGprsApNameLines;
-    maxlength=KMaxGprsApNameLength;
-    allowed_input_modes = EAknEditorTextInputMode | EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorTextInputMode;
-    default_case = EAknEditorLowerCase;
-	avkon_flags = EAknEditorFlagLatinInputModesOnly;
-    flags = EEikEdwinAutoSelection | EEikEdwinNoLineOrParaBreaks;
-    }
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_gprsap_name
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_access_point_name;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_gprsap_name;
-    }
-
-
-
-// LoginName:
-RESOURCE EDWIN r_setting_app_edwin_login_name
-    {
-    width=KLoginNameWidth;
-    lines=KLoginNameLines;
-    maxlength=KMaxLoginNameLength;
-    allowed_input_modes = EAknEditorTextInputMode | EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorTextInputMode;
-    default_case = EAknEditorLowerCase;
-    flags= EEikEdwinAutoSelection | EEikEdwinNoLineOrParaBreaks;
-    avkon_flags=EAknEditorFlagNoT9 | EAknEditorFlagLatinInputModesOnly;    
-    }
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_login_name
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_ap_username;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_login_name;
-    }
-
-
-
-// StartingPage:
-RESOURCE EDWIN r_setting_app_edwin_starting_page
-    {
-    width=KStartPageWidth;
-    lines=KStartPageLines;
-    maxlength=KMaxStartPageLength;
-    numeric_keymap=EAknEditorCalculatorNumberModeKeymap;
-    allowed_input_modes = EAknEditorTextInputMode | EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorTextInputMode;
-    special_character_table = R_AVKON_URL_SPECIAL_CHARACTER_TABLE_DIALOG;
-    default_case = EAknEditorLowerCase;
-    flags= EEikEdwinAutoSelection | EAknEditorLowerCase | EEikEdwinNoLineOrParaBreaks;
-    avkon_flags=EAknEditorFlagNoT9 | EAknEditorFlagLatinInputModesOnly;
-    }
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_starting_page
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_starting_page;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_starting_page;
-    }
-
-
-// Modem init string
-RESOURCE EDWIN r_setting_app_edwin_modem_init_string
-    {
-    width=KModInitStringWidth;
-    lines=KModInitStringLines;
-    maxlength=KMaxModInitStringLength;
-    allowed_input_modes = EAknEditorTextInputMode | EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorTextInputMode;
-    avkon_flags=EAknEditorFlagNoT9 | EAknEditorFlagLatinInputModesOnly;
-    flags= EEikEdwinAutoSelection | EEikEdwinOnlyASCIIChars;
-    }
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_modem_init_string
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_modem_init_string;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_modem_init_string;
-    }
-
-
-
-
-/*
-//        case EApIspDefaultTelNumber:
-//        case EApIspIfCallbackInfo:
-//        case EApWapServiceCentreAddress:
-*/
-
-
-// AccessNumber (edwin):
-RESOURCE EDWIN r_setting_app_edwin_access_num
-    {
-    width=KAccessNumWidth;
-    lines=KAccessNumLines;
-    maxlength=KMaxAccessNumLength;
-    numeric_keymap=EAknEditorStandardNumberModeKeymap;
-    allowed_input_modes=EAknEditorNumericInputMode;
-    default_input_mode=EAknEditorNumericInputMode;
-    avkon_flags=EAknEditorFlagNoT9;
-    flags = EEikEdwinAutoSelection;
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_access_num
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_access_number;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_access_num;
-    }
-
-
-
-// CallbackInfo:
-RESOURCE EDWIN r_setting_app_edwin_cb_num
-    {
-    width = KCBInfoWidth;
-    lines = KCBInfoLines;
-    maxlength = KCBInfoLength;
-    numeric_keymap=EAknEditorStandardNumberModeKeymap;
-    allowed_input_modes = EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorNumericInputMode;
-    avkon_flags = EAknEditorFlagNoT9;
-    flags = EEikEdwinAutoSelection;
-    }
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_cb_num
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_cb_number;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_cb_num;
-    }
-
-
-
-// ServiceCentreAddress: qtn_set_server_access
-RESOURCE EDWIN r_setting_app_edwin_server_access
-    {
-    width=KServiceCentreAddrWidth;
-    lines=KServiceCentreAddrLines;
-    maxlength=KMaxServiceCentreAddrLength;
-    numeric_keymap=EAknEditorStandardNumberModeKeymap;
-    allowed_input_modes=EAknEditorNumericInputMode;
-    default_input_mode=EAknEditorNumericInputMode;
-    avkon_flags=EAknEditorFlagNoT9;
-    flags = EEikEdwinAutoSelection;
-    }
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_server_access
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_server_access;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_server_access;
-    }
-
-
-
-
-// ServiceAccessNumber: qtn_set_service_access, SMS WAP Gateway
-RESOURCE EDWIN r_setting_app_edwin_service_access
-    {
-    width=KServiceAccessNumWidth;
-    lines=KServiceAccessNumLines;
-    maxlength=KMaxServiceAccessNumLength;
-    numeric_keymap=EAknEditorStandardNumberModeKeymap;
-    allowed_input_modes=EAknEditorNumericInputMode;
-    default_input_mode=EAknEditorNumericInputMode;
-    avkon_flags=EAknEditorFlagNoT9;
-    flags = EEikEdwinAutoSelection;
-    }
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_service_access
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_service_access;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_service_access;
-    }
-
-
-
-//////////////////////////////////////////////////////////////////////////////
-//       IPEditor
-//////////////////////////////////////////////////////////////////////////////
-RESOURCE IP_FIELD_EDITOR r_setting_app_ip_editor
-    {
-    min_field_values = IP_FIELD
-        {
-        first_field = 0;
-        second_field = 0;
-        third_field = 0;
-        fourth_field = 0;
-        };
-    max_field_values = IP_FIELD
-        {
-        first_field = 255;
-        second_field = 255;
-        third_field = 255;
-        fourth_field = 255;
-        };
-    flags = 0;
-    }
-
-
-// WapGatewayAddress:
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_gw_addr
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_gateway_ip;
-    type = EAknCtIpFieldEditor;
-    editor_resource_id = r_setting_app_ip_editor;
-    }
-
-
-// IspIPAddr:
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_ispip_addr
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_ip_address;
-    type = EAknCtIpFieldEditor;
-    editor_resource_id = r_setting_app_ip_editor;
-    }
-
-
-
-// IPNameServer1:
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_name_serv1
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_primary_dns;
-    type = EAknCtIpFieldEditor;
-    editor_resource_id = r_setting_app_ip_editor;
-    }
-
-
-// IPNameServer2:
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_name_serv2
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_secondary_dns;
-    type = EAknCtIpFieldEditor;
-    editor_resource_id = r_setting_app_ip_editor;
-    }
-
-//////////////////////////////////////////////////////////////////////////////
-//////////////////////////////////////////////////////////////////////////////
-
-
-
-
-// LoginScript:
-RESOURCE EDWIN r_setting_app_edwin_login_script
-    {
-    width=KLoginScriptWidth;
-    lines=KLoginScriptLines;
-    maxlength=KMaxLoginScriptLength;
-    allowed_input_modes = EAknEditorTextInputMode | EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorTextInputMode;
-	avkon_flags = EAknEditorFlagLatinInputModesOnly;    
-    flags= EEikEdwinAutoSelection;
-    }
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_login_script
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_login_script;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_login_script;
-    }
-
-/*
-special cases
-        case EApIspLoginPass:
-*/
-
-RESOURCE SECRETED r_setting_app_edwin_login_passwd
-    {
-    num_letters=KMaxLoginPasswordLength;
-    }
-
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_login_passwd
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_ap_passwd;
-    type = EEikCtSecretEd;
-    editor_resource_id = r_setting_app_edwin_login_passwd;
-    }
-
-
-
-
-
-
-// Proxy server address:
-RESOURCE EDWIN r_setting_app_edwin_proxy_server_addr
-    {
-    width=KProxyServerWidth;
-    lines=KProxyServerLines;
-    maxlength=KMaxProxyServerLength;
-    numeric_keymap=EAknEditorCalculatorNumberModeKeymap;
-    allowed_input_modes = EAknEditorTextInputMode | EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorTextInputMode;
-    special_character_table = R_AVKON_URL_SPECIAL_CHARACTER_TABLE_DIALOG;
-    default_case = EAknEditorLowerCase;
-	allowed_case_modes = EAknEditorLowerCase | EAknEditorUpperCase;
-	avkon_flags = EAknEditorFlagLatinInputModesOnly;
-    flags= EEikEdwinAutoSelection | EAknEditorLowerCase | EEikEdwinNoLineOrParaBreaks;
-    }
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_proxy_server_addr
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_proxy_server_address;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_proxy_server_addr;
-    }
-
-
-// Proxy port number
-RESOURCE EDWIN r_setting_app_edwin_proxy_port_number
-    {
-    width=KProxyPortNumberWidth;
-    lines=KProxyPortNumberLines;
-    maxlength=KMaxProxyPortNumberLength;
-    allowed_input_modes = EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorNumericInputMode;
-    default_case = EAknEditorLowerCase;
-    flags = EEikEdwinAutoSelection | EEikEdwinNoLineOrParaBreaks;
-    avkon_flags = EAknEditorFlagLatinInputModesOnly;
-    }
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_proxy_port_number
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_proxy_port_number;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_proxy_port_number;
-    }
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-RESOURCE DIALOG r_list_query
-    {
-    flags=EGeneralQueryFlags;
-    buttons=R_AVKON_SOFTKEYS_SELECT_CANCEL__SELECT;
-    items=
-        {
-
-        DLG_LINE
-            {
-            type = EAknCtListQueryControl;
-            id=EListQueryControl;
-            control = AVKON_LIST_QUERY_CONTROL
-                {
-                listtype = EAknCtSinglePopupMenuListBox;
-                listbox = LISTBOX
-                    {
-                    flags = EAknListBoxMenuList;
-                    height = KListQueryHeight;
-                    width = KListQueryWidth;
-                    };
-                heading = qtn_set_new_ap_prompt_list;
-                };
-            }
-        };
-    }
-
-
-
-RESOURCE LISTBOX r_setting_app_listbox
-    {
-    flags = EEikListBoxMultipleSelection;
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_radio_button_setting_page
-    {
-    number = EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    type =  EAknSetListBox;
-    editor_resource_id= r_setting_app_listbox;
-    }
-
-
-
-//----------------------------------------------------
-//
-//    R_AVKON_SOFTKEYS_OK_CANCEL__OK
-//
-//
-//----------------------------------------------------
-//
-RESOURCE CBA r_apsettings_softkeys_ok_cancel_ok
-    {
-    buttons =
-        {
-        CBA_BUTTON {id=EAknSoftkeyOk; txt = text_softkey_ok;},
-        CBA_BUTTON {id=EAknSoftkeyBack; txt = text_softkey_cancel; },
-        CBA_BUTTON {id=EAknSoftkeyOk; txt = qtn_msk_select;}
-        };
-    }
-
-
-RESOURCE AVKON_SETTING_PAGE r_popup_list_setting_page
-    {
-    number = EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = r_apsettings_softkeys_ok_cancel_ok;
-    type =  EAknSetListBox;
-    editor_resource_id= r_setting_app_listbox;
-    }
-
-
-
-// ICONARRAYS
-
-RESOURCE AKN_ICON_ARRAY r_setting_ap_bearer_listbox_icons
-    {
-    bmpfile = APP_BITMAP_DIR"\\ApSettings.mbm";
-    icons =
-        {
-        AKN_ICON
-            {
-            iconId = EMbmApsettingsQgn_prop_wml_gprs;
-            maskId = EMbmApsettingsQgn_prop_wml_gprs_mask;
-            },
-        AKN_ICON
-            {
-            iconId = EMbmApsettingsQgn_prop_wml_csd;
-            maskId = EMbmApsettingsQgn_prop_wml_csd_mask;
-            },
-        AKN_ICON
-            {
-            iconId = EMbmApsettingsQgn_prop_wml_hscsd;
-            maskId = EMbmApsettingsQgn_prop_wml_hscsd_mask;
-            },
-        AKN_ICON
-            {
-            iconId = EMbmApsettingsQgn_prop_wml_sms;
-            maskId = EMbmApsettingsQgn_prop_wml_sms_mask;
-            },
-        AKN_ICON
-            {
-            iconId = EMbmApsettingsQgn_prop_wlan_bearer;
-            maskId = EMbmApsettingsQgn_prop_wlan_bearer_mask;
-            },
-        AKN_ICON
-            {
-            iconId = EMbmApsettingsQgn_prop_wlan_easy;
-            maskId = EMbmApsettingsQgn_prop_wlan_easy_mask;
-            }
-        };
-    }
-
-
-RESOURCE AKN_ICON_ARRAY r_setting_ap_protected_listbox_icons
-    {
-    bmpfile = APP_BITMAP_DIR"\\ApSettings.mbm";
-    icons =
-        {
-        AKN_ICON
-            { iconId = EMbmApsettingsQgn_indi_sett_protected_add;
-              maskId = EMbmApsettingsQgn_indi_sett_protected_add_mask;
-            }
-        };
-    }
-
-
-
-RESOURCE TBUF r_apui_view_text_cannot_access_db
-                { buf = qtn_set_err_db_inaccessible; }
-
-
-
-
-// wait note dialog for delete operation...
-RESOURCE DIALOG r_apui_view_wait_note
-    {
-    flags = EAknWaitNoteFlags | EEikDialogFlagModeless;
-    items=
-        {
-        DLG_LINE
-            {
-            type = EAknCtNote;
-            id = EGeneralNote;
-            control= AVKON_NOTE
-                {
-                layout = EWaitLayout;
-                imagefile = AVKON_ICON_FILE;
-                imageid = EMbmAvkonQgn_note_erased;
-                imagemask = EMbmAvkonQgn_note_erased_mask;
-                animation = R_QGN_GRAF_WAIT_BAR_ANIM;
-                };
-            }
-        };
-    }
-
-
-RESOURCE TBUF r_apui_view_deleting_ap                 
-				{ buf = qtn_set_wait_deleting_ap; }
-
-RESOURCE TBUF r_apui_cmd_select                       
-				{ buf = qtn_set_cmd_select; }
-
-RESOURCE TBUF r_apui_cmd_edit_ap                               
-				{ buf = qtn_set_cmd_edit_ap; }
-
-RESOURCE TBUF r_apui_cmd_new                                   
-				{ buf = qtn_set_cmd_new_ap; }
-
-RESOURCE TBUF r_apui_cmd_new_blank                             
-				{ buf = qtn_set_cmd_new_default; }
-
-RESOURCE TBUF r_apui_cmd_new_use_existing                      
-				{ buf = qtn_set_cmd_new_existing; }
-
-RESOURCE TBUF r_apui_cmd_del_iap                               
-				{ buf = qtn_set_cmd_del_ap; }
-
-RESOURCE TBUF r_apui_cmd_help                                  
-				{ buf = qtn_set_options_help; }
-
-RESOURCE TBUF r_apui_cmd_exit                                  
-				{ buf = qtn_set_options_exit; }
-
-
-
-
-
-RESOURCE TBUF r_apui_navi_ap                                  
-				{ buf = qtn_set_navi_ap; }
-
-RESOURCE TBUF r_apui_note_ap_in_use_edit                      
-				{ buf = qtn_set_note_ap_in_use_edit; }
-RESOURCE TBUF r_apui_note_ap_in_use_delete                    
-				{ buf = qtn_set_note_ap_in_use_del; }
-
-RESOURCE TBUF r_apui_note_protected_ap                    
-				{ buf = qtn_set_note_protected_ap; }
-RESOURCE TBUF r_apui_note_protected_ap_sett               
-				{ buf = qtn_set_note_protected_ap_sett; }
-
-RESOURCE TBUF r_apui_note_cannot_use_protected_ap 
-				{ buf = qtn_netw_info_cannot_use_protected_ap; }
-
-
-RESOURCE TBUF r_apui_iap_are_you_sure_to_del                  
-				{ buf = qtn_query_common_conf_delete; }
-
-RESOURCE TBUF r_apui_iap_conf_max_speed_wcdma                 
-				{ buf = qtn_set_conf_max_speed_only_3g; }
-
-RESOURCE TBUF r_apui_iap_del_last_ap                          
-				{ buf = qtn_set_note_delete_last_ap; }
-RESOURCE TBUF r_apui_iap_create_new                            
-				{ buf = qtn_set_ap_create_new; }
-RESOURCE TBUF r_apui_iap_delete_linked                        
-				{ buf = qtn_set_ap_delete_linked; }
-RESOURCE TBUF r_apui_title_access_points                       
-				{ buf = qtn_set_title_access_points; }
-RESOURCE TBUF r_apui_ap_access_number_not                     
-				{ buf = qtn_set_ap_access_number_not; }
-RESOURCE TBUF r_apui_ap_server_access_number_not              
-				{ buf = qtn_set_ap_server_access_number_not; }
-
-RESOURCE TBUF r_apui_options_change                            
-				{ buf = qtn_set_options_change; }
-RESOURCE TBUF r_apui_options_ap_advanced                       
-				{ buf = qtn_set_options_ap_advanced; }
-
-
-// TBUF resources for the setting list
-RESOURCE TBUF r_apui_view_connection_name                      
-				{ buf = qtn_set_ap_conn_name; }
-
-RESOURCE TBUF r_apui_view_bearer_type                          
-				{ buf = qtn_set_ap_bearer; }
-
-RESOURCE TBUF r_apui_view_wtls_security                        
-				{ buf = qtn_set_wtls_security; }
-
-RESOURCE TBUF r_apui_view_connection_type                      
-				{ buf = qtn_set_conn_type; }
-
-
-// for GPRS bearer
-RESOURCE TBUF r_apui_view_ap_name                              
-				{ buf = qtn_set_access_point_name; }
-
-RESOURCE TBUF r_apui_view_user_name                            
-				{ buf = qtn_set_ap_username; }
-
-RESOURCE TBUF r_apui_view_prompt_password                      
-				{ buf = qtn_set_prompt_passwd; }
-
-RESOURCE TBUF r_apui_view_password                             
-				{ buf = qtn_set_ap_passwd; }
-
-RESOURCE TBUF r_apui_view_password_auth                        
-				{ buf = qtn_set_passwd_aut; }
-
-RESOURCE TBUF r_apui_view_wap_gw_ip_addr                       
-				{ buf = qtn_set_gateway_ip; }
-
-RESOURCE TBUF r_apui_view_starting_page                        
-				{ buf = qtn_set_starting_page; }
-
-
-
-// for GPRS Advanced
-RESOURCE TBUF r_apui_view_phone_ip_addr                        
-				{ buf = qtn_set_ip_address; }
-
-RESOURCE TBUF r_apui_view_primary_name_server                  
-				{ buf = qtn_set_primary_dns; }
-
-RESOURCE TBUF r_apui_view_secondary_name_server                
-				{ buf = qtn_set_secondary_dns; }
-
-
-
-// for CSD
-RESOURCE TBUF r_apui_view_access_number                        
-				{ buf = qtn_set_access_number; }
-
-RESOURCE TBUF r_apui_view_data_call_type                       
-				{ buf = qtn_set_data_call_type; }
-
-RESOURCE TBUF r_apui_view_max_conn_speed                       
-				{ buf = qtn_set_max_speed; }
-
-
-// for CSD Advanced
-RESOURCE TBUF r_apui_view_use_call_back                        
-				{ buf = qtn_set_use_cb; }
-
-RESOURCE TBUF r_apui_view_call_back_type                       
-				{ buf = qtn_set_cb_type; }
-
-RESOURCE TBUF r_apui_view_call_back_number                     
-				{ buf = qtn_set_cb_number; }
-
-RESOURCE TBUF r_apui_view_enable_ppp_comp                      
-				{ buf = qtn_set_ppp_comp; }
-
-RESOURCE TBUF r_apui_view_use_login_script                     
-				{ buf = qtn_set_use_logins; }
-
-RESOURCE TBUF r_apui_view_login_script                         
-				{ buf = qtn_set_login_script; }
-
-RESOURCE TBUF r_apui_view_modem_init_string                    
-				{ buf = qtn_set_modem_init_string; }
-
-
-// for SMS
-RESOURCE TBUF r_apui_view_server_access_number                 
-				{ buf = qtn_set_server_access; }
-
-RESOURCE TBUF r_apui_view_service_access_number                
-				{ buf = qtn_set_service_access; }
-
-
-
-
-
-// 'Textual' but fixed values for settings
-RESOURCE TBUF r_apui_view_bearer_type_gprs                     
-				{ buf =  qtn_set_bearer_packet_data; }
-
-RESOURCE TBUF r_apui_view_bearer_type_csd                      
-				{ buf =  qtn_set_bearer_data_call; }
-
-RESOURCE TBUF r_apui_view_bearer_type_hscsd                    
-				{ buf =  qtn_netw_sett_bearer_hscsd; }
-
-RESOURCE TBUF r_apui_view_bearer_type_sms                      
-				{ buf =  qtn_set_bearer_sms; }
-
-
-RESOURCE TBUF r_apui_view_prompt_passwd_yes                    
-				{ buf =  qtn_set_prompt_passwd_yes; }
-
-RESOURCE TBUF r_apui_view_prompt_passwd_no                     
-				{ buf =  qtn_set_prompt_passwd_no; }
-
-RESOURCE TBUF r_apui_view_password_auth_normal                 
-				{ buf =  qtn_set_passwd_aut_normal; }
-
-RESOURCE TBUF r_apui_view_password_auth_secure                 
-				{ buf =  qtn_set_passwd_aut_secure; }
-
-RESOURCE TBUF r_apui_view_ip_addr_dynamic                      
-				{ buf =  qtn_set_ip_address_dynamic; }
-
-RESOURCE TBUF r_apui_view_wtls_security_on                     
-				{ buf =  qtn_set_wtls_security_on; }
-
-RESOURCE TBUF r_apui_view_wtls_security_off                    
-				{ buf =  qtn_set_wtls_security_off; }
-
-
-
-RESOURCE TBUF r_apui_view_conn_type_contin                     
-				{ buf =  qtn_set_conn_type_contin; }
-
-RESOURCE TBUF r_apui_view_conn_type_temp                       
-				{ buf =  qtn_set_conn_type_temp; }
-
-RESOURCE TBUF r_apui_view_datacall_analolgue                   
-				{ buf =  qtn_set_data_call_analolgue; }
-
-RESOURCE TBUF r_apui_view_datacall_isdn_110                    
-				{ buf =  qtn_set_data_call_isdn_110; }
-
-RESOURCE TBUF r_apui_view_datacall_isdn_120                    
-				{ buf =  qtn_set_data_call_isdn_120; }
-
-RESOURCE TBUF r_apui_view_speed_autodetect	{ buf =  qtn_set_speed_auto_detect;}
-RESOURCE TBUF r_apui_view_speed_9600		{ buf =  "9600"; }
-RESOURCE TBUF r_apui_view_speed_14400		{ buf =  "14400"; }
-RESOURCE TBUF r_apui_view_speed_19200		{ buf =  "19200"; }
-RESOURCE TBUF r_apui_view_speed_28800		{ buf =  "28800"; }
-RESOURCE TBUF r_apui_view_speed_38400		{ buf =  "38400"; }
-RESOURCE TBUF r_apui_view_speed_43200		{ buf =  "43200"; }
-RESOURCE TBUF r_apui_view_speed_56000		{ buf =  "56000"; }
-
-
-RESOURCE TBUF r_apui_view_use_cb_yes		{ buf =  qtn_set_use_cb_yes; }
-RESOURCE TBUF r_apui_view_use_cb_no         { buf =  qtn_set_use_cb_no; }
-
-
-RESOURCE TBUF r_apui_view_cb_use_server_number                 
-				{ buf =  qtn_set_use_server_number; }
-
-RESOURCE TBUF r_apui_view_cb_use_other_number                  
-				{ buf =  qtn_set_use_other_number; }
-
-
-RESOURCE TBUF r_apui_view_ppp_comp_yes		{ buf =  qtn_set_ppp_comp_yes; }
-RESOURCE TBUF r_apui_view_ppp_comp_no       { buf =  qtn_set_ppp_comp_no; }
-
-RESOURCE TBUF r_apui_view_use_logins_no     { buf =  qtn_set_use_logins_no; }
-RESOURCE TBUF r_apui_view_use_logins_yes    { buf =  qtn_set_use_logins_yes; }
-
-RESOURCE TBUF r_apui_view_term_win_yes		{ buf =  qtn_set_term_win_yes; }
-RESOURCE TBUF r_apui_view_term_win_no       { buf =  qtn_set_term_win_no; }
-
-RESOURCE TBUF r_apui_view_new_ap_prompt_list                   
-				{ buf =  qtn_set_new_ap_prompt_list; }
-
-RESOURCE TBUF r_apui_view_default_ap		{ buf =  qtn_set_default_ap; }
-
-RESOURCE TBUF r_apui_view_saved             { buf =  qtn_set_ap_saved; }
-
-RESOURCE TBUF r_apui_view_wap_start_page_default      { buf =  "http://"; }
-
-RESOURCE TBUF r_apui_iap_name_already_exists                   
-				{ buf =  qtn_fldr_name_already_used; }
-
-RESOURCE TBUF r_apui_view_compulsory		{ buf =  qtn_set_compulsory; }
-
-RESOURCE TBUF r_apui_view_ap_none                              
-				{ buf = qtn_mce_settings_mms_none; }
-
-RESOURCE TBUF r_apui_view_invalid_number                       
-				{ buf = qtn_info_invalid_number; }
-
-RESOURCE TBUF r_apui_view_invalid_conn_name                    
-				{ buf = qtn_info_invalid_conn_name; }
-
-
-RESOURCE TBUF r_apui_sett_val_field_none                       
-				{ buf = qtn_selec_sett_val_field_none; }
-
-
-
-
-
-RESOURCE TBUF r_apui_view_proxy_server_addr           { buf = qtn_set_proxy_server_address; }
-
-RESOURCE TBUF r_apui_view_proxy_port_number           { buf = qtn_set_proxy_port_number; }
-
-
-RESOURCE TBUF r_apui_view_network_group               { buf = qtn_set_network_group; }
-
-
-RESOURCE TBUF r_apui_sett_home_page_none              { buf = qtn_set_home_page_none; }
-
-
-
-
-RESOURCE TBUF r_apui_view_pdp_type					  { buf = qtn_set_network_type; }
-
-RESOURCE TBUF r_apui_view_pdp_type_ipv4               { buf = qtn_set_nw_type_ipv4; }
-
-RESOURCE TBUF r_apui_view_pdp_type_ipv6               { buf = qtn_set_nw_type_ipv6; }
-
-RESOURCE TBUF r_apui_view_ipv4_settings	              { buf = qtn_set_ipv4_settings; }
-
-RESOURCE TBUF r_apui_view_ipv6_settings	              { buf = qtn_set_ipv6_settings; }
-
-RESOURCE TBUF r_apui_view_set_dns_servers_ip          { buf = qtn_set_dns_servers_ip; }
-
-RESOURCE TBUF r_apui_view_set_info_invalid_ip         { buf = qtn_set_info_invalid_ip; }
-
-RESOURCE TBUF r_apui_view_set_ip_user_defined         { buf = qtn_set_ip_user_defined; }
-
-RESOURCE TBUF r_apui_view_set_ip_well_known           { buf = qtn_set_ip_well_known; }
-
-
-RESOURCE TBUF r_apui_note_vpn_ap_sett				  { buf = qtn_set_note_vpn_ap_sett; }
-
-
-RESOURCE TBUF r_apui_iap_del_iap_associated			  
-				{ buf = qtn_vpn_quest_delete_iap_associated; }
-
-
-
-// WLAN strings & resources
-
-RESOURCE TBUF r_apui_view_bearer_type_wlan
-				{ buf =  qtn_wlan_sett_bearer_wlan; }
-
-RESOURCE TBUF r_apui_view_wlan_network_name
-				{ buf =  qtn_wlan_sett_network_name ; }
-
-
-RESOURCE TBUF r_apui_view_wlan_network_mode
-				{ buf =  qtn_wlan_sett_network_mode ; }
-
-
-RESOURCE TBUF r_apui_view_wlan_security_mode
-				{ buf =  qtn_wlan_sett_security_mode ; }
-
-
-RESOURCE TBUF r_apui_view_wlan_security_settings
-				{ buf =  qtn_wlan_sett_security_settings ; }
-
-
-RESOURCE TBUF r_apui_view_wlan_network_mode_infra
-				{ buf =  qtn_wlan_sett_network_mode_infra ; }
-
-
-RESOURCE TBUF r_apui_view_wlan_network_mode_adhoc
-				{ buf =  qtn_wlan_sett_network_mode_adhoc ; }
-
-
-RESOURCE TBUF r_apui_view_wlan_security_mode_open
-				{ buf =  qtn_wlan_sett_security_mode_open ; }
-
-
-RESOURCE TBUF r_apui_view_wlan_security_mode_wep
-				{ buf =  qtn_wlan_sett_security_mode_wep ; }
-
-
-RESOURCE TBUF r_apui_view_wlan_security_mode_802_1x
-				{ buf =   qtn_wlan_sett_security_mode_802_1x ; }
-
-
-RESOURCE TBUF r_apui_view_wlan_security_mode_wpa
-				{ buf =   qtn_wlan_sett_security_mode_wpa ; }
-
-
-RESOURCE TBUF r_apui_view_wlan_network_name_user
-				{ buf =   qtn_wlan_sett_network_name_user_defined ; }
-
-
-RESOURCE TBUF r_apui_view_wlan_network_name_scan
-				{ buf =   qtn_wlan_sett_network_name_scan ; }
-
-
-RESOURCE TBUF r_apui_ap_wlan_name_not_defined
-				{ buf = qtn_wlan_quest_nw_name_not_defined; }
-
-
-RESOURCE TBUF r_apui_netmask
-				{ buf = qtn_netw_sett_subnet_mask; }
-
-
-RESOURCE TBUF r_apui_ip_gateway
-				{ buf = qtn_netw_sett_default_gateway; }
-
-
-RESOURCE TBUF r_apui_view_wlan_hidden_network
-				{ buf =  qtn_wlan_sett_hidden_network; }
-
-RESOURCE TBUF r_apui_view_hidden_network_yes		
-                { buf =  qtn_wlan_sett_hidden_network_yes; }
-                
-RESOURCE TBUF r_apui_view_hidden_network_no      
-                { buf =  qtn_wlan_sett_hidden_network_no; }
-
-RESOURCE TBUF r_apui_view_netw_quest_iap_incomplete_delete
-                { buf =  qtn_netw_quest_iap_incomplete_delete; }
-
-
-RESOURCE TBUF r_apui_view_ad_hoc
-                { buf = qtn_wlan_sett_adhoc_channel; }
-
-RESOURCE TBUF r_apui_view_ad_hoc_prmpt
-                { buf = qtn_wlan_prmpt_adhoc_channel; }
-
-RESOURCE TBUF r_apui_view_ad_hoc_channel_auto
-                { buf = qtn_wlan_sett_adhoc_channel_automatic; }
-
-RESOURCE TBUF r_apui_view_ad_hoc_channel_user_defined
-                { buf = qtn_wlan_sett_adhoc_channel_user_defined; }
-                
-RESOURCE TBUF r_apui_ap_wlan_sec_sett_empty
-				{ buf = qtn_wlan_quest_security_settings_empty; }
-
-
-RESOURCE TBUF r_apui_view_avkon_compulsory		
-                { buf =  qtn_selec_setting_compulsory; }
-
-
-RESOURCE TBUF r_apui_view_no_iap_defined_info		
-                { buf =  qtn_netw_info_no_iap_defined; }
-
-//----------------------------------------------------
-//
-//    r_apsettingsui_select_network_menubar
-//
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_BAR r_apsettingsui_select_network_menubar
-    {
-    titles=
-        {
-        MENU_TITLE { menu_pane=r_apsettingsui_menu_network; txt="A"; }
-        };
-    }
-
-
-//----------------------------------------------------
-//
-//    r_apsettingsui_menu_network
-//
-//
-//----------------------------------------------------
-//
-RESOURCE MENU_PANE r_apsettingsui_menu_network
-    {
-    items=
-        {
-        MENU_ITEM { command=EApSelCmdSelect; txt= qtn_set_cmd_select; },
-        MENU_ITEM { command=EApSelCmdNew; txt= qtn_set_cmd_new_netw_group;},
-        MENU_ITEM { command=EApSelCmdDelete; txt= qtn_set_cmd_del_ap; },
-        MENU_ITEM { command=EAknCmdHelp; txt= qtn_set_options_help; },
-        MENU_ITEM { command=EApSelCmdExit; txt= qtn_set_options_exit; }
-        };
-    }
-
-RESOURCE AVKON_SETTING_PAGE r_popup_list_network_setting_page
-    {
-    number = EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OPTIONS_BACK__SELECT;
-    menubar = r_apsettingsui_select_network_menubar;
-    type =  EAknSetListBox;
-    editor_resource_id= r_setting_app_listbox;
-    }
-
-
-
-
-
-
-// Network name editor resources
-// Network name
-RESOURCE EDWIN r_setting_app_edwin_netw_name
-    {
-    width=KNetworkNameWidth;
-    lines=KNetworkNameLines;
-    maxlength=KMaxNetworkNameLength;
-    allowed_input_modes = EAknEditorTextInputMode | EAknEditorNumericInputMode;
-    default_input_mode = EAknEditorTextInputMode;
-    flags= EEikEdwinAutoSelection | EEikEdwinNoLineOrParaBreaks;
-    }
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_netw_name
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_set_ap_netw_name;
-    type = EEikCtEdwin;
-    editor_resource_id = r_setting_app_edwin_netw_name;
-    }
-
-
-
-
-
-
-RESOURCE DIALOG r_dnsip4_query
-	{
-	flags=EGeneralQueryFlags;
-	buttons=R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-	items=
-		{
-		DLG_LINE
-			{
-			type=EAknExtCtMultilineQuery;
-			id=EMultilineFirstLine;
-			control = AVKON_DATA_QUERY
-				{ 
-				layout = EMultiDataFirstIpEd;
-                label = qtn_set_primary_dns;
-                control = IP_FIELD_EDITOR
-                    {
- 						min_field_values = IP_FIELD
- 						{ 
- 						first_field = IPADDRESS_MIN_FIRST_FIELD_VALUE;
- 						second_field = IPADDRESS_MIN_SECOND_FIELD_VALUE;
- 						third_field = IPADDRESS_MIN_THIRD_FIELD_VALUE;
- 						fourth_field = IPADDRESS_MIN_FOURTH_FIELD_VALUE;
- 						};
- 						max_field_values = IP_FIELD
- 						{
- 							first_field = IPADDRESS_MAX_FIRST_FIELD_VALUE;
- 							second_field = IPADDRESS_MAX_SECOND_FIELD_VALUE;
- 							third_field = IPADDRESS_MAX_THIRD_FIELD_VALUE;
- 							fourth_field = IPADDRESS_MAX_FOURTH_FIELD_VALUE;
- 						};
- 						flags = 0;
-					};
- 				};
-			},
-		DLG_LINE
-			{
-             type = EAknExtCtMultilineQuery;
-             id = EMultilineSecondLine;
-             control = AVKON_DATA_QUERY
-                 {
-                 layout = EMultiDataSecondIpEd;
-                 label = qtn_set_secondary_dns;
-                 control = IP_FIELD_EDITOR
-                     {
-                     min_field_values = IP_FIELD
- 						{ 
- 							first_field = IPADDRESS_MIN_FIRST_FIELD_VALUE;
- 							second_field = IPADDRESS_MIN_SECOND_FIELD_VALUE;
- 							third_field = IPADDRESS_MIN_THIRD_FIELD_VALUE;
- 							fourth_field = IPADDRESS_MIN_FOURTH_FIELD_VALUE;
- 						};
- 						max_field_values = IP_FIELD
- 						{
- 							first_field = IPADDRESS_MAX_FIRST_FIELD_VALUE;
- 							second_field = IPADDRESS_MAX_SECOND_FIELD_VALUE;
- 							third_field = IPADDRESS_MAX_THIRD_FIELD_VALUE;
- 							fourth_field = IPADDRESS_MAX_FOURTH_FIELD_VALUE;
- 						};
- 						flags = 0;
-					};
- 				};
-			}
-		};
-	}
-
-
-
-
-
-RESOURCE DIALOG r_dnsip6_query
-	{
-	flags=EGeneralQueryFlags;
-	buttons=R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-	items=
-		{
-		DLG_LINE
-			{
-			type=EAknCtMultilineQuery;
-			id=EMultilineFirstLine;
-			control = AVKON_DATA_QUERY
-				{ 
-					layout = EMultiDataFirstEdwin;
-					label = qtn_set_primary_dns;
-					control = EDWIN
-					    {
-				    	avkon_flags = EAknEditorFlagLatinInputModesOnly;
-						flags=0;
-						width=16;
-						lines=1;
-						maxlength=KMaxIPv6NameServerLength;
-						};
-				};
-			},
-		DLG_LINE
-			{
-			type=EAknCtMultilineQuery;
-			id=EMultilineSecondLine;
-			control= AVKON_DATA_QUERY 
-				{ 
-					layout = EMultiDataSecondEdwin;
-					label = qtn_set_secondary_dns;
-					control=EDWIN 
-					    {
-                    	avkon_flags = EAknEditorFlagLatinInputModesOnly;
-						flags= 0;
-						width=16;
-						lines=1;
-						maxlength=KMaxIPv6NameServerLength;
-						};
-				};
-			}
-		};
-	}
-
-
-
-
-RESOURCE TBUF r_apui_view_new_ap_user_name_none
-				{ buf =  qtn_set_ap_username_none; }
-
-RESOURCE TBUF r_apui_view_new_ap_proxy_server_addr_none
-				{ buf =  qtn_set_proxy_server_address_none; }
-
-RESOURCE TBUF r_apui_view_new_ap_cb_number_none 
-				{ buf =  qtn_set_cb_number_none; }
-
-RESOURCE TBUF r_apui_view_new_ap_login_script_none                   
-				{ buf =  qtn_set_login_script_none; }
-
-RESOURCE TBUF r_apui_view_new_ap_modem_init_none 
-				{ buf =  qtn_set_modem_init_none; }
-
-RESOURCE TBUF r_apui_view_new_ap_dns_servers_automatic                   
-				{ buf =  qtn_set_dns_servers_automatic ; }
-
-RESOURCE TBUF r_apui_view_new_ap_dns_server_automatic
-				{ buf =  qtn_set_dns_server_automatic; }
-
-RESOURCE TBUF r_apui_view_no_security_settings
-				{ buf =  qtn_wlan_info_no_security_settings; }
-
-
-
-
-// EApIspIPNetMask:
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_isp_net_mask
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_netw_sett_subnet_mask;
-    type = EAknCtIpFieldEditor;
-    editor_resource_id = r_setting_app_ip_editor;
-    }
-
-
-// EApIspIPGateway:
-RESOURCE AVKON_SETTING_PAGE r_text_setting_page_isp_gateway
-    {
-    number= EAknSettingPageNoOrdinalDisplayed;
-    softkey_resource = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-    label= qtn_netw_sett_default_gateway;
-    type = EAknCtIpFieldEditor;
-    editor_resource_id = r_setting_app_ip_editor;
-    }
-
-
-
-RESOURCE DIALOG r_apui_wlan_name_query
-   {
-   flags = EGeneralQueryFlags;
-   buttons = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-   items =
-       {
-       DLG_LINE
-             {
-             type = EAknCtQuery;
-             id = EGeneralQuery;
-             control = AVKON_DATA_QUERY
-                    {
-                    layout = EDataLayout;
-                    label = qtn_wlan_prmpt_network_name;
-                    control = EDWIN
-                        {
-                        maxlength = KMaxWlanNetworkameLength;
-                        flags = EEikEdwinNoWrap;
-                        };
-                    };
-             }
-        };
-    }
-
-
-
-
-RESOURCE DIALOG r_apui_wlan_adhoc_channel_query
-   {
-   flags = EGeneralQueryFlags;
-   buttons = R_AVKON_SOFTKEYS_OK_CANCEL__OK;
-   items =
-       {
-       DLG_LINE
-             {
-             type = EAknCtQuery;
-             id = EGeneralQuery;
-             control = AVKON_DATA_QUERY
-                   {
-                   layout = ENumberLayout;
-                   label = qtn_wlan_prmpt_adhoc_channel;
-                   control = AVKON_INTEGER_EDWIN
-                         {
-                         maxlength = KMaxAdhocChannelNumberLength;
-                         min = KAdhocChannelMin;
-	                     max = KAdhocChannelMax;
-                         };
-                   };
-             }
-        };
-    }
-
-// End of File
--- a/apengine/apsettingshandlerui/group/ApSettingsHandlerUiCvt.mmp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,43 +0,0 @@
-/*
-* Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Project specification for Accesspoint UI
-*               Component Validation Test.
-*      
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-TARGET      ApSettingsHandlerUICvt.exe
-TARGETTYPE  exe
-
-SOURCEPATH  ../tsrc
-
-SOURCE      ApSettingsHandlerUICvt.cpp
-
-// Component specific internal headers 
-USERINCLUDE			../inc
-
-// ADO-SUBSYSTEM specific internal headers 
-SYSTEMINCLUDE		../../inc
-
-// ADO specific internal headers 
-SYSTEMINCLUDE		../../../inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-LIBRARY     ApSettingsHandlerUI.lib
-LIBRARY     euser.lib
--- a/apengine/apsettingshandlerui/group/Apsettingshandlerui.mmp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,156 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     This is project specification file for the ApSettingsHandler.
-*
-*/
-
-
-#include <data_caging_paths.hrh>
-#include <platform_paths.hrh>
-
-
-TARGET      ApSettingsHandlerUI.dll
-TARGETTYPE      DLL
-UID         0x1000008d 0x10008d3B
-
-CAPABILITY CAP_GENERAL_DLL
-
-VENDORID VID_DEFAULT
-
-
-SOURCEPATH ../src
-SOURCE  apsettingshandleruiImpl.cpp
-SOURCE  apsettingsui.cpp
-SOURCE  apsettingshandlerui.cpp
-SOURCE  ApSelQueryDialog.cpp
-SOURCE  TextOverrides.cpp
-SOURCE  ApSelectorDialog.cpp
-SOURCE  ApSelectorListBox.cpp
-SOURCE  ApSelectorListBoxModel.cpp
-SOURCE  ApSettingsModel.cpp
-SOURCE  ApSettingsCommons.cpp
-SOURCE  ApSettingsDlg.cpp
-SOURCE  ApSelPopupList.cpp
-SOURCE  apsettingsdeleteoperation.cpp
-SOURCE  AccessPointTextSettingPage.cpp
-SOURCE  ApNetSelPopupList.cpp
-SOURCE  ApNetSelectorListBoxModel.cpp
-SOURCE  FeatureManagerWrapper.cpp
-SOURCE  ApMultiLineDataQueryDialog.cpp
-
-
-START RESOURCE ../data/apsetui.rss
-HEADER
-TARGETPATH RESOURCE_FILES_DIR
-LANGUAGE_IDS
-
-END  // RESOURCE
-
-// Component specific internal headers 
-USERINCLUDE			../inc
-
-// ADO specific internal headers 
-SYSTEMINCLUDE		../../../inc
-
-//Macro to /epoc32 headers
-MW_LAYER_SYSTEMINCLUDE
-
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-APP_LAYER_SYSTEMINCLUDE
-#endif
-
-LIBRARY euser.lib
-LIBRARY cone.lib
-LIBRARY eikcore.lib
-LIBRARY eikcoctl.lib
-LIBRARY avkon.lib
-LIBRARY eikdlg.lib 
-LIBRARY bafl.lib
-LIBRARY eikctl.lib
-LIBRARY apengine.lib 
-LIBRARY commonengine.lib 
-LIBRARY diskspacereserver.lib
-LIBRARY commdb.lib
-LIBRARY insock.lib
-LIBRARY sysutil.lib
-LIBRARY commonui.lib
-LIBRARY FeatMgr.lib
-LIBRARY AknInputLanguage.lib
-
-LIBRARY ConnectionUiUtilities.lib
-LIBRARY centralrepository.lib
-
-
-#if defined(ARMCC)
-    DEFFILE ../EABI/ApSettingsHandlerUI_EKA2.def
-#elif defined( WINSCW )
-    DEFFILE ../BWinsCw/ApSettingsHandlerUI_EKA2.def
-#elif defined( WINS )
-    DEFFILE ../BWins/ApSettingsHandlerUI_EKA2.def
-#else
-    DEFFILE ../BMarm/ApSettingsHandlerUI_EKA2.def
-#endif
-
-
-#ifdef __SERIES60_HELP
-    LIBRARY         hlplch.lib // for "Help" options menu
-#endif // __SERIES60_HELP
-
-
-LIBRARY efsrv.lib
-LIBRARY AknSkins.lib
-LIBRARY charconv.lib
-
-
-// Define this macro if you wish to enable IPv6 support for testing
-// It will override FeatureManager's NOT SUPPORTED....
-// MACRO __TEST_IPV6_SUPPORT    
-
-// Define this macro if you wish to disable HsCSD support for testing
-// It will override shared datakey setting....
-// MACRO __TEST_NO_HSCSD
-
-
-// Define this to test CSD support.
-// MACRO __TEST_CSD_SUPPORT
-
-
-// Define this to test HSCSD support.
-// MACRO __TEST_HSCSD_SUPPORT
-
-// Define this to test CDMA write-protect support.
-//MACRO __TEST_CDMA_WRITE_PROTECT
-
-// Define this to test WLAN support.
-//#define __TEST_WLAN_SUPPORT_ENABLED
-
-// Define this to use logging.
-// #define __TEST_LOGGING_ENABLED
-
-
-#ifdef __TEST_LOGGING_ENABLED
-    MACRO __TEST_LOGGING
-    LIBRARY flogger.lib
-#endif
-
-// Define this to test LAN support.
-#ifdef WINS
-    MACRO __TEST_LAN_BEARER
-#endif
-
-#ifdef __TEST_WLAN_SUPPORT_ENABLED
-    MACRO __TEST_WLAN_SUPPORT
-#endif // __TEST_WLAN_SUPPORT
-// End of File
--- a/apengine/apsettingshandlerui/group/apsettingshandleruiicons.mk	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,75 +0,0 @@
-#
-# Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description: 
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-# ----------------------------------------------------------------------------
-# Configure these
-# ----------------------------------------------------------------------------
-
-TARGETDIR=$(ZDIR)\SYSTEM\Data
-HEADERDIR=\epoc32\include
-ICONTARGETFILENAME=$(TARGETDIR)\apsettings.mif
-HEADERFILENAME=$(HEADERDIR)\apsettings.mbg
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# Configure these.
-#
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
-                /c8,1 qgn_prop_wml_gprs.bmp  \
-                /c8,1 qgn_prop_wml_csd.bmp   \
-                /c8,1 qgn_prop_wml_hscsd.bmp \
-                /c8,1 qgn_prop_wml_sms.bmp   \
-		/c8,1 qgn_prop_wlan_bearer.bmp \
-		/c8,1 qgn_prop_wlan_easy.bmp \
-                /c8,1 qgn_indi_sett_protected_add.bmp
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(HEADERFILENAME)&& \
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/apengine/apsettingshandlerui/group/apsettingshandleruiicons_dc.mk	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-#
-# Copyright (c) 2003 Nokia Corporation and/or its subsidiary(-ies).
-# All rights reserved.
-# This component and the accompanying materials are made available
-# under the terms of "Eclipse Public License v1.0"
-# which accompanies this distribution, and is available
-# at the URL "http://www.eclipse.org/legal/epl-v10.html".
-#
-# Initial Contributors:
-# Nokia Corporation - initial contribution.
-#
-# Contributors:
-#
-# Description:  Makefile for icons of ApSettingsHandlerUi
-#
-
-ifeq (WINS,$(findstring WINS, $(PLATFORM)))
-ZDIR=\epoc32\release\$(PLATFORM)\$(CFG)\Z
-else
-ZDIR=\epoc32\data\z
-endif
-
-
-TARGETDIR=$(ZDIR)\resource\apps
-ICONTARGETFILENAME=$(TARGETDIR)\apsettings.mif
-
-HEADERDIR=\epoc32\include
-HEADERFILENAME=$(HEADERDIR)\apsettings.mbg
-
-do_nothing :
-	@rem do_nothing
-
-MAKMAKE : do_nothing
-
-BLD : do_nothing
-
-CLEAN : do_nothing
-
-LIB : do_nothing
-
-CLEANLIB : do_nothing
-
-# ----------------------------------------------------------------------------
-# NOTE 1: DO NOT DEFINE MASK FILE NAMES! They are included automatically by
-# MifConv if the mask detph is defined.
-#
-# NOTE 2: Usually, source paths should not be included in the bitmap
-# definitions. MifConv searches for the icons in all icon directories in a
-# predefined order, which is currently \s60\icons, \s60\bitmaps2, \s60\bitmaps.
-# The directory \s60\icons is included in the search only if the feature flag
-# __SCALABLE_ICONS is defined.
-# ----------------------------------------------------------------------------
-
-RESOURCE :
-	mifconv $(ICONTARGETFILENAME) /h$(HEADERFILENAME) \
-                /c8,1 qgn_prop_wml_gprs.bmp  \
-                /c8,1 qgn_prop_wml_csd.bmp   \
-                /c8,1 qgn_prop_wml_hscsd.bmp \
-                /c8,1 qgn_prop_wml_sms.bmp   \
-		/c8,1 qgn_prop_wlan_bearer.bmp \
-		/c8,1 qgn_prop_wlan_easy.bmp \
-                /c8,1 qgn_indi_sett_protected_add.bmp
-
-FREEZE : do_nothing
-
-SAVESPACE : do_nothing
-
-RELEASABLES :
-	@echo $(HEADERFILENAME)&& \
-	@echo $(ICONTARGETFILENAME)
-
-FINAL : do_nothing
--- a/apengine/apsettingshandlerui/group/bld.inf	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,56 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*    This file provides the information required for building the
-*    whole of a ApSettingsUI.
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-// export iby files
-../Rom/ApSettingsHandlerUI.iby		CORE_MW_LAYER_IBY_EXPORT_PATH(ApSettingsHandlerUI.iby)
-../Rom/ApSettingsHandlerUIResources.iby	LANGUAGE_MW_LAYER_IBY_EXPORT_PATH(ApSettingsHandlerUIResources.iby)
-
-// export localised loc file
-../loc/apsettingshandlerui.loc	MW_LAYER_LOC_EXPORT_PATH(apsettingshandlerui.loc)
-
-PRJ_MMPFILES
-// gnumakefile apsettingshandleruiicons_dc.mk
-
-./Apsettingshandlerui.mmp
-
-
-PRJ_TESTMMPFILES
-
-PRJ_EXTENSIONS
-
-START EXTENSION s60/mifconv
-OPTION TARGETFILE apsettings.mif
-OPTION HEADERFILE apsettings.mbg
-OPTION SOURCES -c8,1 qgn_prop_wml_gprs  \
-               -c8,1 qgn_prop_wml_csd   \
-               -c8,1 qgn_prop_wml_hscsd \
-               -c8,1 qgn_prop_wml_sms   \
-		           -c8,1 qgn_prop_wlan_bearer \
-		           -c8,1 qgn_prop_wlan_easy \
-               -c8,1 qgn_indi_sett_protected_add
-END
-
-// End of File
--- a/apengine/apsettingshandlerui/inc/APSettingsHandlerUIVariant.hrh	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     This file contains variation info for ApSettingsHandlerUi.
-*     The file can be included in C++ or resource file.
-*
-*/
-
-
-#ifndef APSETTINGSHANDLERUIVARIANT_HRH
-#define APSETTINGSHANDLERUIVARIANT_HRH
-
-// This flag indicates whether the Wap related settings are visible 
-// in the Access Point Settings UI or not
-
-#define KWSPSettingsVisible	0x01
-
-
-// feature to disable editing of normal access points and allow it only for VPN
-#define KApUiEditOnlyVPNs 0x02
-
-
-#endif      //  APSETTINGSHANDLERUIVARIANT_HRH
-
-// End of File
--- a/apengine/apsettingshandlerui/inc/AccessPointTextSettingPage.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of class CAccessPointTextSettingPage.
-*
-*/
-
-
-#ifndef ACCESSPOINT_TEXT_SETTING_PAGE_H
-#define ACCESSPOINT_TEXT_SETTING_PAGE_H
-
-// INCLUDE FILES
-#include <akntextsettingpage.h>
-
-
-// FORWARD DECLARATION
-class CApSelectorListboxModel;
-
-
-// CLASS DECLARATION
-
-/**
-* Model for the access point listbox. It is an array of CApSelectorItem
-* pointers; items are owned.
-*/
-NONSHARABLE_CLASS( CAccessPointTextSettingPage ) : public CAknTextSettingPage
-    {
-public:
-    /**
-    * Simple constructor depending only on a single resource Id. 
-    * Editor resource is given via the link in the setting page resource.
-    *
-    * @param aResourceID Setting Page to use (if present)
-    * @param aText Reference to text for editing
-    * @param aTextSettingPageFlags option flags for miscellaneous things
-    * @param aIsLatin Giving whether the editor should be Latin only
-    */
-    CAccessPointTextSettingPage( TInt aResourceID, TDes& aText,
-                                 TInt aTextSettingPageFlags = 0,
-                                 TBool aIsLatin = EFalse );
-    /**
-    * Constructor that allows separate setting page and editor resources
-    *
-    * This constructor allows the use of setting page using only the editor 
-    * resource. Other combinations are also possible
-    *
-    * In all cases the number (if supplied i.e. <> 0 ) is used.
-    *
-    *   Editor    Setting Page 
-    *  Resource    Resource
-    *   present     present     Both are used (but text & number overridden)
-    *    = 0        present     Editor resource is used via SP resource 
-    *                           (Effectively like the other constructor)
-    *   present      = 0        Default Avkon SP resource if used 
-    *                           + this editor resource
-    *    = 0         = 0        uses default resource for both SP and editor.
-    *                           This is OK if:
-    *   i) control type is present,
-    *   ii) a default resource exists 
-    *       ( OK for text, integer, date, time, duration )
-    *
-    * Note: THe first argument is a TDesC* (rather than TDesC&) because 
-    * the other constructor cannot initialize such a member without allocation
-    * or having an internal dummy buffer.
-    * Note that this buffer must be owned by the client until 
-    * ExecuteLD has been called.
-    *
-    * Rules for text and numbers: The rules are the same for both:  (non-zero
-    * length) text or number other than EAknSettingPageNoOrdinalDisplayed if 
-    * given in this constructor will not override resource (unless that is 
-    * zero length or EAknSettingPageNoOrdinalDisplayed). Note, however, 
-    * that text or number given via the specific API for setting them, 
-    * WILL override resource.
-    * It is assumed that number from resource is very rare. Special text 
-    * is somewhat more likely.
-    *
-    * @param aSettingTitleText      Text at top of setting pane; 
-    *                               OWNED EXTERNALLY
-    * @param aSettingNumber         Number at top left (if present)
-    * @param aControlType           Determines the type constructed 
-    *                               and how its resource is read
-    * @param aEditorResourceId      Editor resource to use in the setting page
-    *                               (if present)
-    * @param aSettingPageResourceId Setting Page to use (if present)
-    * @param aText                  Reference to text for editing
-    * @param aTextSettingPageFlags  option flags for miscellaneous things
-    * @param aIsLatin               Gives whether the editor should accept 
-    *                               only Latin input 
-    */
-    CAccessPointTextSettingPage( const TDesC* aSettingTitleText,
-                                 TInt aSettingNumber,
-                                 TInt aControlType,
-                                 TInt aEditorResourceId,
-                                 TInt aSettingPageResourceId,
-                                 TDes& aText,
-                                 TInt aTextSettingPageFlags = 0,
-                                 TBool aIsLatin = EFalse );
-
-
-
-    /**
-    * 2nd stage construction for this specific type.  Call BaseConstructL in
-    * CAknSettingPage, where the object is constructed from resource.
-    *
-    */
-    virtual void ConstructL();
-
-    TBool iIsLatin;
-    };
-
-
-#endif
-
-// End of file
--- a/apengine/apsettingshandlerui/inc/ApMultiLineDataQueryDialog.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,72 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of class CApMultiLineDataQueryDialog.
-*
-*/
-
-
-#ifndef AP_MULTILINE_IP_QUERY_DIALOG_H
-#define AP_MULTILINE_IP_QUERY_DIALOG_H
-
-// INCLUDE FILES
-#include <AknQueryDialog.h>
-
-
-// FORWARD DECLARATION
-
-
-// CLASS DECLARATION
-
-/**
-* A new class to extend the functionality of the existing 
-* CAKnMultiLineIpQueryDialog to be able to accept 0 length settings...
-* Nothing else is changed.
-*/
-NONSHARABLE_CLASS( CApMultiLineDataQueryDialog ) : 
-                    public CAknMultiLineDataQueryDialog
-    {
-public:
-    public:
-        /**
-        * Multiline data query dialog, 2 lines
-        * @param aText1 Text1
-        * @param aText2 Text2
-        * @param aTone Tone 
-        * @return A constructed CApMultiLineDataQueryDialog
-        */
-        static CApMultiLineDataQueryDialog* NewL(
-                            TDes&  aText1, TDes&  aText2, 
-                            TTone aTone = ENoTone);
-
-
-    protected:
-        /**
-        * If the query text is ok (retrieved form query controls) then 
-        * display the left soft key, otherwise hide it.
-        */
-        void UpdateLeftSoftKeyL();
-
-    private:
-        /**
-        * Constructor
-        * @param aTone Tone
-        */
-        CApMultiLineDataQueryDialog( const TTone& aTone );
-
-    };
-
-
-#endif
-
-// End of file
--- a/apengine/apsettingshandlerui/inc/ApNetSelPopupList.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,206 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declares CApNetSelPopupList for network selection.
-*
-*/
-
-
-#ifndef APNETSEL_POPUP_LIST_DIALOG_H
-#define APNETSEL_POPUP_LIST_DIALOG_H
-
-// INCLUDES
-
-#include <aknradiobuttonsettingpage.h>
-#include <ActiveApDb.h>  // for MActiveApDbObserver
-
-#include <ApSettingsHandlerCommons.h>
-
-
-// FORWARD DECLARATIONS
-
-class CApNetSelectorListboxModel;
-class CApSettingsHandlerImpl;
-class CApSettingsModel;
-
-
-// CLASS DECLARATION
-/**
-* CApNetSelPopupList class
-* Pop-up network selector 'control' object.
-*/
-NONSHARABLE_CLASS( CApNetSelPopupList ) : public CAknRadioButtonSettingPage, 
-                                          public MActiveApDbObserver
-    {
-
-    public: // Constructors and destructor
-
-        /**
-        * 2 phase construction
-        * @param aModel     The data model object
-        * @param aHandler   The data handler object
-        * @param aCurrentSelectionIndex The required selection index
-        * @param aPreferredUid  The preferred UID
-        * @param aEventStore    Stores the events
-        * @param aItemArray     Itemarray
-        * @param aNeedsNone Gives whether it disoplays the item 'None' or not
-        * @return the constructed CApNetSelPopupList object
-        */
-        static CApNetSelPopupList* NewL
-                                (
-                                CApSettingsModel& aModel,
-                                CApSettingsHandlerImpl& aHandler,
-                                TInt& aCurrentSelectionIndex,
-                                TInt& aPreferredUid,
-                                TUint32& aEventStore,
-                                CDesCArrayFlat* aItemArray,
-                                TBool aNeedsNone
-                                );
-
-        // Two phased construction
-        virtual void ConstructL();
-
-    private:
-        /**
-        * 2 phase construction
-        * @param aModel     The data model object
-        * @param aHandler   The data handler object
-        * @param aCurrentSelectionIndex The required selection index
-        * @param aPreferredUid  The preferred UID
-        * @param aEventStore    Stores the events
-        * @param aItemArray     Itemarray
-        * @param aNeedsNone Gives whether it disoplays the item 'None' or not
-        * @return the constructed CApNetSelPopupList object
-        */
-        CApNetSelPopupList
-            (
-            CApSettingsModel& aModel,
-            CApSettingsHandlerImpl& aHandler,
-            TInt& aIndex,
-            TInt& aPreferredUid,
-            CDesCArrayFlat* aItemArray,
-            TUint32& aEventStore,
-            TBool aNeedsNone
-            );
-
-        virtual ~CApNetSelPopupList();
-
-    public: // New functions
-        void SetHighlighted();
-
-    private:
-        /**
-        * It tells whether the Select menu item needs to be deleted or not
-        * @param aResourcfeId   The menu resource ID
-        * @return Boolean indicating whether the Select menu item 
-        * needs to be deleted or not
-        */
-        TBool Need2DeleteSelect( TInt aResourceId );
-
-        /**
-        * It tells whether the Open & the Dlete menu item needs
-        * to be deleted or not
-        * @param aResourcfeId   The menu resource ID
-        * @return Boolean indicating whether the Delete menu item 
-        * needs to be deleted or not        
-        */
-        TBool Need2DeleteOpenDelete( TInt aResourceId );
-
-
-        /**
-        * Creates a new network group
-        * @return TBool indicating successful creation
-        */
-        TBool HandleCreateNewNetworkGroupL();
-
-
-    public: // Functions from base classes
-        // From CCoeControl
-        virtual void GetHelpContext(TCoeHelpContext& aContext) const;
-
-        /**
-        * Implements the MActiveApDbObserver protocol
-        */
-        virtual void HandleApDbEventL( TEvent anEvent );
-
-
-        /**
-        * Overrides ActivateL
-        */
-        virtual void ActivateL();
-
-    protected:
-        // From CAknRadioButtonPage
-        /*
-        * Needed to know about SELECTION (not HIGHLIGHT!) changes
-        * to be able to update currently valid selection UID.
-        */
-        virtual void SelectCurrentItemL();
-
-    private:
-        /**
-        * From CAknSettingPage
-        */
-        TBool OkToExitL( TInt aButtonId );
-
-    protected:  // New functions
-        /**
-        * Fills up listbox control with data dynamically
-        */
-        void FillListBoxWithDataL();
-
-        /*
-        * Sets the Selected item in the list.
-        * Needed to initialize the list according to the Uid and 
-        * not to 'itemindex'...
-        */
-        void SetSelectedL();
-
-    protected:  // Functions from base classes
-
-        /**
-        * From CAknSettingPage
-        */
-        virtual void DynInitMenuPaneL( TInt aResourceId, 
-                                       CEikMenuPane* aMenuPane );
-
-        // From MEikCommandObserver
-        virtual void ProcessCommandL( TInt aCommandId );
-
-        // From CCoeControl
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, 
-                                     TEventCode aType);
-
-    private: //data
-        CApSettingsModel*           iDataModel; // not owned, passed for usage
-        CAknSetStyleListBox*        iList;
-        
-        CApNetSelectorListboxModel* iModel;     // owns it, just passes 
-                                                // items for usage to list!
-        
-        TInt*                       iSelected;  // not owns it,passed for usage
-        CApSettingsHandlerImpl*     iHandler;   // not owns it,passed for usage
-        TUint32*                    iEventStore;// to hold the events
-        TUint32                     iPreferredUid;
-        TInt                        iPreferredLine;
-        TBool                       iNeedsNone;
-        TBool                       iNeedUnlock;
-        TBool						iHelpSupported;
-        TBool                       iProtectionSupported;
-
-    };
-
-#endif // APNETSEL_POPUP_LIST_DIALOG_H
-
-// End of File
--- a/apengine/apsettingshandlerui/inc/ApNetSelectorListBoxModel.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of class CApNetSelectorListboxModel.
-*
-*/
-
-
-#ifndef APNETSELECTOR_LISTBOX_MODEL_H
-#define APNETSELECTOR_LISTBOX_MODEL_H
-
-// INCLUDE FILES
-#include <eikdialg.h>
-#include <ApNetworkItemList.h>
-
-
-// CONSTANTS
-// Granularity of the model array.
-const TInt KGranularity = 8;
-
-
-_LIT( KListItemFormatGraphicOnOff, "%d\t%*S" );
-
-const TInt KMaxFormatSize = sizeof( KListItemFormatGraphicOnOff );
-const TInt KMaxListItemNameLength = 50; // = KCommsDbSvrMaxFieldLength
-
-
-/**
-* Buffer size for formatting listbox text. Maximum item length
-* plus listbox internals (tabulators for icons etc.) must fit into it.
-*
-* Important note:
-* The model of the listbox is a CAknFilteredTextListBoxModel.
-* The *itemarray* of that model is this class. That is, whatever is in
-* the model (this class), it may not be visible, if it is filtered out.
-* We always must use the listbox's Model() to get visible ones.
-*/
-const TInt KMaxApSelectorListboxName = KMaxListItemNameLength+KMaxFormatSize;
-
-
-// CLASS DECLARATION
-
-/**
-* Model for the network group selection listbox. 
-* It is an array of CApNetworkItem pointers; 
-* items are owned.
-*/
-NONSHARABLE_CLASS( CApNetSelectorListboxModel ) :
-        public CApNetworkItemList,
-        public MDesCArray
-    {
-    public:     // Construct / destruct
-
-        /**
-        * Constructor.
-        */
-        CApNetSelectorListboxModel( );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CApNetSelectorListboxModel();
-
-    public:     // from MDesCArray
-
-        /**
-        * Get number of items in the model.
-        * @return Number of items.
-        */
-        TInt MdcaCount() const;
-
-        /**
-        * Text to be displayed for this item.
-        * @param aIndex Index of item.
-        * @return TPtrC for this item text (text owned by the model).
-        */
-        TPtrC MdcaPoint( TInt aIndex ) const;
-
-
-    public:
-        /**
-        * index <--> Uid conversion
-        * @param aUid UID
-        * @param aErr Error code 
-        * @return The index for the passed UID 
-        */
-        TInt Item4Uid( TUint32 aUid, TInt& aErr ) const;
-
-    private:    // data
-        /**
-        * Formats the text of the listbox.
-        * @param aIndex Index of item.
-        * @param aBuf Buffer to store formatted text.
-        */
-        void FormatListboxText( TInt aIndex, TDes& aBuf ) const;
-
-        /**
-        * MdcaPoint() cannot leave, so this buffer is allocated
-        * to allow formatting. Fortunately, doesn't have to be very
-        * large.
-        * We have to use MUTABLE CAST, as MdcaPoint is const (odd enough),
-        * so wouldn't allow formatting the text in a member...
-        */
-        __MUTABLE TBuf<KMaxApSelectorListboxName> iBuf;
-
-    };
-
-
-#endif
-
-// End of file
--- a/apengine/apsettingshandlerui/inc/ApSelPopupList.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,344 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declares CApSelPopupList for access point selection.
-*/
-
-
-#ifndef APSEL_POPUP_LIST_DIALOG_H
-#define APSEL_POPUP_LIST_DIALOG_H
-
-// INCLUDES
-#include <aknradiobuttonsettingpage.h>
-#include <ApSettingsHandlerCommons.h>
-#include <ActiveApDb.h>  // for MActiveApDbObserver
-
-
-#include <AknIconArray.h>
-
-
-// FORWARD DECLARATIONS
-class CApSelectorListboxModel;
-class CApSettingsHandlerImpl;
-
-
-// CLASS DECLARATION
-/**
-* CApSelPopupList class
-* Pop-up access point selector 'control' object.
-*/
-NONSHARABLE_CLASS( CApSelPopupList ) : public CAknRadioButtonSettingPage, 
-                                       public MActiveApDbObserver
-    {
-
-    public: // Constructors and destructor
-
-        /**
-        * Creates the popup list selector object
-        * @param aModel                 Data model to be used for reading data.
-        *                               Not owned. Must remain intact while 
-        *                               the dialog exists.
-        * @param aHandler               A CApSettingsHandlerImpl handling data
-        * @param aCurrentSelectionIndex The item to highlight
-        * @param aPreferredUid          The preferred Uid to select
-        * @param aSelMenuType           The Options menu type it should have
-        * @param aIspFilter             The ISP filtering criteria
-        * @param aBearerFilter          The bearer filtering criteria
-        * @param aSortType              The ordering type for the list
-        * @param aEventStore            Event information holder
-        * @param aItemArray             The listbox items
-        * @param aNeedsNone             Gives whether 'None' item is present
-        * @param aNoEdit                Gives wether editing is allowed or not
-        * @param aReqIpvType            The IPv types included in the list
-        * @param aVpnFilterType         The VPN filtering type
-        * @return The created popup list selector object
-        */
-        static CApSelPopupList* NewL
-                                (
-                                CApSettingsModel& aModel,
-                                CApSettingsHandlerImpl& aHandler,
-                                TInt& aCurrentSelectionIndex,
-                                TInt& aPreferredUid,
-                                TSelectionMenuType aSelMenuType,
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType,
-                                TUint32& aEventStore,
-                                CDesCArrayFlat* aItemArray,
-                                TBool aNeedsNone,
-                                TBool aNoEdit,
-                                TInt aReqIpvType = EIPv4,
-                                TVpnFilterType aVpnFilterType = EVpnFilterBoth
-                                );
-
-
-
-        /**
-        * Creates the popup list selector object
-        * @param aModel                 Data model to be used for reading data.
-        *                               Not owned. Must remain intact while 
-        *                               the dialog exists.
-        * @param aHandler               A CApSettingsHandlerImpl handling data
-        * @param aCurrentSelectionIndex The item to highlight
-        * @param aPreferredUid          The preferred Uid to select
-        * @param aSelMenuType           The Options menu type it should have
-        * @param aIspFilter             The ISP filtering criteria
-        * @param aBearerFilter          The bearer filtering criteria
-        * @param aSortType              The ordering type for the list
-        * @param aEventStore            Event information holder
-        * @param aItemArray             The listbox items
-        * @param aNeedsNone             Gives whether 'None' item is present
-        * @param aReqIpvType            The IPv types included in the list
-        * @param aVpnFilterType         The VPN filtering type
-        * @param aIncludeEasyWlan       To include Easy WLAN AP's or not
-        * @param aNoEdit                Gives wether editing is allowed or not
-        * @return The created popup list selector object
-        */
-        static CApSelPopupList* NewL
-                                (
-                                CApSettingsModel& aModel,
-                                CApSettingsHandlerImpl& aHandler,
-                                TInt& aCurrentSelectionIndex,
-                                TInt& aPreferredUid,
-                                TSelectionMenuType aSelMenuType,
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType,
-                                TUint32& aEventStore,
-                                CDesCArrayFlat* aItemArray,
-                                TBool aNeedsNone,
-                                TInt aReqIpvType,
-                                TVpnFilterType aVpnFilterType,
-                                TBool aIncludeEasyWlan,
-                                TBool aNoEdit
-                                );
-
-        /**
-        * Constructor
-        */
-        virtual void ConstructL();
-
-
-    protected:
-        /**
-        * Creates the popup list selector object
-        * @param aModel                 Data model to be used for reading data.
-        *                               Not owned. Must remain intact while 
-        *                               the dialog exists.
-        * @param aHandler               A CApSettingsHandlerImpl handling data
-        * @param aIndex                 The item to highlight
-        * @param aPreferredUid          The preferred Uid to select
-        * @param aSelMenuType           The Options menu type it should have
-        * @param aIspFilter             The ISP filtering criteria
-        * @param aBearerFilter          The bearer filtering criteria
-        * @param aSortType              The ordering type for the list
-        * @param aItemArray             The listbox items
-        * @param aEventStore            Event information holder
-        * @param aNeedsNone             Gives whether 'None' item is present
-        * @param aNoEdit                Gives wether editing is allowed or not
-        * @param aReqIpvType            The IPv types included in the list
-        * @param aVpnFilterType         The VPN filtering type
-        * @return The created popup list selector object
-        */
-        CApSelPopupList
-            (
-            CApSettingsModel& aModel,
-            CApSettingsHandlerImpl& aHandler,
-            TInt& aIndex,
-            TInt& aPreferredUid,
-            TSelectionMenuType aSelMenuType,
-            TInt aIspFilter,
-            TInt aBearerFilter,
-            TInt aSortType,
-            CDesCArrayFlat* aItemArray,
-            TUint32& aEventStore,
-            TBool aNeedsNone,
-            TBool aNoEdit,
-            TInt aReqIpvType = EIPv4,
-            TVpnFilterType aVpnFilterType = EVpnFilterBoth
-            );
-
-
-
-        /**
-        * Creates the popup list selector object
-        * @param aModel                 Data model to be used for reading data.
-        *                               Not owned. Must remain intact while 
-        *                               the dialog exists.
-        * @param aHandler               A CApSettingsHandlerImpl handling data
-        * @param aIndex                 The item to highlight
-        * @param aPreferredUid          The preferred Uid to select
-        * @param aSelMenuType           The Options menu type it should have
-        * @param aIspFilter             The ISP filtering criteria
-        * @param aBearerFilter          The bearer filtering criteria
-        * @param aSortType              The ordering type for the list
-        * @param aItemArray             The listbox items
-        * @param aEventStore            Event information holder
-        * @param aNeedsNone             Gives whether 'None' item is present
-        * @param aReqIpvType            The IPv types included in the list
-        * @param aVpnFilterType         The VPN filtering type
-        * @param aIncludeEasyWlan       To include Easy WLAN AP's or not
-        * @param aNoEdit                Gives wether editing is allowed or not
-        * @return The created popup list selector object
-        */
-        CApSelPopupList
-            (
-            CApSettingsModel& aModel,
-            CApSettingsHandlerImpl& aHandler,
-            TInt& aIndex,
-            TInt& aPreferredUid,
-            TSelectionMenuType aSelMenuType,
-            TInt aIspFilter,
-            TInt aBearerFilter,
-            TInt aSortType,
-            CDesCArrayFlat* aItemArray,
-            TUint32& aEventStore,
-            TBool aNeedsNone,
-            TInt aReqIpvType,
-            TVpnFilterType aVpnFilterType,
-            TBool aIncludeEasyWlan,
-            TBool aNoEdit
-            );
-
-        /**
-        * Destructor
-        */
-        virtual ~CApSelPopupList();
-
-
-    public: // New functions
-        /**
-        * Sets the highlight.
-        */
-        void SetHighlighted();
-
-    private:
-
-        /**
-        * Loads our own icons
-        * @return The icon offset where they were appended.
-        */
-        TInt LoadIconsL();
-
-
-    public: // Functions from base classes
-        // From CCoeControl
-        virtual void GetHelpContext(TCoeHelpContext& aContext) const;
-
-        /**
-        * Implements the MActiveApDbObserver protocol
-        */
-        virtual void HandleApDbEventL( TEvent anEvent );
-
-
-        /**
-        * Overrides ActivateL
-        */
-        virtual void ActivateL();
-
-        // from CCoeControl
-        virtual void HandleResourceChange(TInt aType);
-
-    protected:
-        // From CAknRadioButtonPage
-        /*
-        * Needed to know about SELECTION (not HIGHLIGHT!) changes
-        * to be able to update currently valid selection UID.
-        */
-        virtual void SelectCurrentItemL();
-        
-    private:
-        /**
-        * From CAknSettingPage
-        */
-        TBool OkToExitL( TInt aButtonId );
-
-
-    protected:  // New functions
-        /**
-        * Fills up listbox control with data dynamically
-        */
-        void FillListBoxWithDataL();
-        
-
-        /*
-        * Sets the Selected item in the list.
-        * Needed to initialize the list according to the Uid 
-        * and not to 'itemindex'...
-        */
-        void SetSelectedL();
-
-
-        /*
-        * Checks for & handles the 'empty list' situation.
-        * According to the spec., prompts for creating a new one...
-        */
-        void CheckIfEmptyL();
-
-    protected:  // Functions from base classes
-
-        /**
-        * From CAknSettingPage
-        */
-        virtual void DynInitMenuPaneL( TInt aResourceId, 
-                                       CEikMenuPane* aMenuPane );
-
-        // From MEikCommandObserver
-        virtual void ProcessCommandL( TInt aCommandId );
-        
-        // From MEikListBoxObserver
-        void HandleListBoxEventL( CEikListBox* aListBox, 
-                MEikListBoxObserver::TListBoxEvent aEventType );
-
-        // From CCoeControl
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, 
-                                     TEventCode aType);
-
-    private: //data
-        CApSettingsModel*               iDataModel; // not owns it, 
-                                                    // just passed for usage!
-        CAknSetStyleListBox*            iList;
-        CApSelectorListboxModel*        iModel;     // owns it, just passes
-                                                    // items for usage to list!
-        TInt*                           iSelected;  // does not owns it, 
-                                                    // just passed for usage!
-        TInt                            iBearerFilter;
-        TInt                            iIspFilter;
-        TInt                            iSortType;
-        TSelectionMenuType              iSelMenuType;
-        CApSettingsHandlerImpl*         iHandler;       // does not owns it, 
-                                                        // passed for usage
-        TUint32*                        iEventStore;    // to hold the events
-        TUint32                         iPreferredUid;
-        TInt                            iPreferredLine;
-        TBool                           iNeedsNone;
-        TBool                           iNeedUnlock;
-
-        TInt                            iReqIpvType; // Default is IPv4
-        TVpnFilterType                  iVpnFilterType;
-        TInt                            iVariant;       /// Local variant value
-
-        CAknIconArray*                  iIcons;
-
-        TBool                           iIncludeEasyWlan;
-        TBool                           iInitialised;
-        TBool                           iNoEdit;
-        TBool							iHelpSupported;
-        TBool							iProtectionSupported;
-        TBool                           iDoExit;
-    };
-
-#endif
-
-// End of File
--- a/apengine/apsettingshandlerui/inc/ApSelQueryDialog.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,121 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declares dialog CApSelQueryDialog for access point selection.
-*
-*/
-
-
-#ifndef APSEL_QUERY_DIALOG_H
-#define APSEL_QUERY_DIALOG_H
-
-// INCLUDES
-#include <aknlistquerydialog.h>
-#include <ApSettingsHandlerCommons.h>
-#include <ActiveApDb.h>
-
-// FORWARD DECLARATIONS
-class CApSelectorListboxModel;
-
-// CLASS DECLARATION
-/**
-* CApSelQueryDialog class
-* 
-*/
-NONSHARABLE_CLASS( CApSelQueryDialog ) : public CAknListQueryDialog, 
-                                         public MActiveApDbObserver
-    {
-
-    public: // Constructors and destructor
-
-        /**
-        * Constructor
-        * @param aModel a reference to the data model
-        * @param aIndex a pointer to hold the UID of the selected item
-        * @return The constructed access point selection query dialog
-        */
-        CApSelQueryDialog( CApSettingsModel& aModel, 
-                           TUint32* aIndex );
-
-        /**
-        * Destructor
-        */
-        virtual ~CApSelQueryDialog();
-
-
-    public: // Functions from base classes
-        /**
-        * from MActiveApDbObserver
-        */
-        virtual void HandleApDbEventL( TEvent anEvent );
-
-
-    private:
-        /**
-        * From CAknListQueryDialog
-        */
-        virtual void PreLayoutDynInitL( void );
-
-
-        /**
-        * From CAknListQueryDialog
-        */
-        virtual void PostLayoutDynInitL();
-
-
-        /**
-        * From CAknListQueryDialog 
-        */
-        TBool OkToExitL( TInt aButtonId );
-
-
-        // From CCoeControl
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent, 
-                                     TEventCode aType); 
-
-
-        // From MEikCommandObserver
-        void ProcessCommandL( TInt aCommandId );
-
-
-    protected:  // New functions
-        /**
-        * Fills up listbox control with data 
-        */
-        void FillListBoxWithDataL();
-
-
-        /**
-        * Loads protected icons
-        * @return The icon offset where they were appended.
-        */
-        TInt LoadIconsL();
-
-
-    protected:  // Functions from base classes
-
-
-    private: //data
-        CApSettingsModel*               iDataModel; // does not own it, 
-                                                    // just passed for usage!
-        CEikListBox*                    iList;
-        CApSelectorListboxModel*        iModel;
-        TUint32*                        iSelected;
-        TBool                           iNeedUnlock;
-
-    };
-
-#endif
-
-// End of File
--- a/apengine/apsettingshandlerui/inc/ApSelectorDialog.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,249 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declares dialog CApSelectorDialog for access point selection.
-*
-*/
-
-
-#ifndef APSELECTORDIALOG_H
-#define APSELECTORDIALOG_H
-
-// INCLUDES
-#include <aknlists.h>
-#include <AknForm.h>
-
-#include <ApSettingsHandlerCommons.h>
-#include <ActiveApDb.h>
-
-// FORWARD DECLARATIONS
-class CApSelectorListboxModel;
-class CApSelectorListbox;
-class CTextOverrides;
-class CEikStatusPane;
-class CAknTitlePane;
-class CAknNavigationControlContainer;
-class CAknNavigationDecorator;
-class CApSettingsModel;
-class CApSettingsHandlerImpl;
-
-
-// CLASS DECLARATION
-/**
-* CApSelectorDialog dialog class
-* 
-*/
-NONSHARABLE_CLASS( CApSelectorDialog ) : 
-        public CAknDialog, public MEikListBoxObserver, 
-        public MActiveApDbObserver
-    {
-
-    public: // Constructors and destructor
-        /**
-        * Create and launch dialog.
-        * @param aModel Model to be used for reading data. Not owned.
-        * Must remain intact while the dialog exists.
-        * @param aHandler A CApSettingsHandlerImpl 
-        * @param aHighLight The item to highlight
-        * @param aSelected  The UID of the selected item. 
-        * @return The dialog's return code
-        */
-        TInt ConstructAndRunLD( CApSettingsModel& aModel, 
-                                CApSettingsHandlerImpl& aHandler,
-                                TUint32 aHighLight, TUint32& aSelected );
-
-
-   
-        /**
-        * Construct the dialog. The passed parameters determine 
-        * the filtering rules it will use.
-        * @param aListType      The list type it should use to display 
-        *                       the list of access points
-        * @param aSelMenuType   The Options menu type it should have
-        * @param aIspFilter     The ISP filtering criteria
-        * @param aBearerFilter  The bearer filtering criteria
-        * @param aSortType      The ordering type for the list
-        * @param aEventStore    Event information holder
-        * @param aNoEdit        Gives wether editing is allowed or not
-        * @param aReqIpvType    The IPv type which are included in the list
-        * @return The constructed dialog object
-        */
-        static CApSelectorDialog* NewL( TSelectionListType aListType,
-                                        TSelectionMenuType aSelMenuType,
-                                        TInt aIspFilter,
-                                        TInt aBearerFilter,
-                                        TInt aSortType,
-                                        TUint32& aEventStore,
-                                        TBool aNoEdit,
-                                        TInt aReqIpvType = EIPv4 
-                                        );
-
-
-        /** 
-        * Destructor.
-        */
-        ~CApSelectorDialog();
-
-    protected:
-        /**
-        * Constructor. The passed parameters determine 
-        * the filtering rules it will use.
-        * @param aListType      The list type it should use to display 
-        *                       the list of access points
-        * @param aSelMenuType   The Options menu type it should have
-        * @param aIspFilter     The ISP filtering criteria
-        * @param aBearerFilter  The bearer filtering criteria
-        * @param aSortType      The ordering type for the list
-        * @param aEventStore    Event information holder
-        * @param aReqIpvType    The IPv type which are included in the list
-        * @param aNoEdit        Gives wether editing is allowed or not
-        */
-        CApSelectorDialog(  TSelectionListType aListType,
-                            TSelectionMenuType aSelMenuType,
-                            TInt aIspFilter,
-                            TInt aBearerFilter,
-                            TInt aSortType,
-                            TUint32& aEventStore,
-                            TInt aReqIpvType,
-                            TBool aNoEdit
-                          );
-
-
-
-    public: // New functions
-
-        /**
-        * Sets initial texts
-        */
-        void InitTextsL();
-
-
-        /**
-        * Handles listbox data changes
-        */
-        void HandleListboxDataChangeL();
-
-        
-        /**
-        * Sets the text overrides.
-        * @param aOverrides An object containing the overriden texts
-        */
-        void SetTextOverrides( CTextOverrides* aOverrides );
-
-        
-        /**
-        * Checks if the list is empty
-        */
-        void CheckIfEmptyL();
-
-        
-        /**
-        * Sets the highlight 
-        */
-        void SetHighlighted();
-
-    public: // Functions from base classes
-        // From CCoeControl
-        virtual void ActivateL();
-        
-        // From CCoeControl
-        virtual void GetHelpContext(TCoeHelpContext& aContext) const;
-
-        // From MActiveApDbObserver
-        virtual void HandleApDbEventL( TEvent anEvent );
-
-        // From MEikCommandObserver
-        virtual void ProcessCommandL( TInt aCommandId ) ; 
-
-        // From MEikListBoxObserver
-        void HandleListBoxEventL( CEikListBox* aListBox, 
-                                  TListBoxEvent aEventType );
-
-        SEikControlInfo CreateCustomControlL( TInt aControlType );
-
-        // From MEikMenuObserver
-        virtual void DynInitMenuPaneL( TInt aResourceId, 
-                                       CEikMenuPane* aMenuPane );
-
-        // From CAknDialog
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                     TEventCode aType);
-
-
-    protected:
-        // From CEikDialog
-        virtual void PreLayoutDynInitL();
-
-        
-        // From CEikDialog
-        virtual void PostLayoutDynInitL();
-
-        // From CAknDialog
-        TBool OkToExitL( TInt aButtonId );
-
-        /**
-        * Internal representation of the implementation of 
-        * ProcessCommandL from MEikCommandObserver
-        */
-        void DoProcessCommandL( TInt aCommandId );
-
-
-    private: //data
-
-        CEikStatusPane*                 iStatusPane;    // NOT owned
-        CAknTitlePane*                  iTitlePane;     // NOT owned
-        CAknNavigationControlContainer* iNaviPane;      // NOT owned
-        CAknNavigationDecorator*        iNaviDecorator; // owned
-        HBufC*                          iOldTitleText;
-        CApSettingsModel*               iDataModel; // not owned,
-                                                    // passed for usage
-        CApSelectorListbox*             iList;
-
-        CApSettingsHandlerImpl*         iHandler;
-        CApSelectorListboxModel*        iModel;
-        TSelectionListType              iListType;
-        TSelectionMenuType              iSelMenuType;
-
-        TUint32                         iHighLight;
-        TUint32*                        iSelected;        
-
-        TInt                            iIspFilter;
-        TInt                            iBearerFilter;
-        TInt                            iSortType;
-
-        CTextOverrides*                 iTextOverrides; // not owned,
-                                                        // passed for usage
-
-        TUint32                         iPreferredUid;
-        TInt                            iPreferredLine;
-        TUint32*                        iEventStore;
-        TBool                           iNeedUnlock;
-        TBool                           iModelPassed;
-        TApUiExitReason                 iExitReason;
-        
-        TInt                            iReqIpvType; /// Default is IPv4
-        TInt                            iVariant;    /// Local variant value
-
-#ifdef __TEST_OOMDEBUG
-        TBool                           iMemTestOn;
-#endif // __TEST_OOMDEBUG
-        
-        TBool                           iInitialised;
-        TBool                           iNoEdit;
-        TBool							iHelpSupported;
-    };
-
-#endif
-
-// End of File
--- a/apengine/apsettingshandlerui/inc/ApSelectorListBoxModel.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,152 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of class CApSelectorListboxModel.
-*
-*/
-
-
-#ifndef APSELECTOR_LISTBOX_MODEL_H
-#define APSELECTOR_LISTBOX_MODEL_H
-
-// INCLUDE FILES
-#include <eikdialg.h>
-#include <ApListItemList.h>
-
-
-// CONSTANTS
-// Granularity of the model array.
-const TInt KGranularity = 8;
-
-// const TInt KErrInvalidBitmapType = -300;
-
-_LIT( KListItemFormatGraphicBearer, "%d\t%*S\t\t" );
-_LIT( KListItemFormatGraphicNone, "%*S" );
-_LIT( KListItemFormatGraphicOnOff, "%d\t%*S" );
-
-_LIT( KListItemFormatGraphicProtected, "%d\t%*S\t%d\t" );
-_LIT( KListItemFormatGraphicOnOffWithLock, "%d\t%*S\t\t%d\t" );
-_LIT( KListItemFormatGraphicWithLock, "%*S\t\t%d\t" );
-
-const TInt KMaxFormatSize = sizeof( KListItemFormatGraphicBearer );
-const TInt KMaxListItemNameLength = 50; // = KCommsDbSvrMaxFieldLength
-
-/**
-* Buffer size for formatting listbox text. Maximum item length
-* plus listbox internals (tabulators for icons etc.) must fit into it.
-*
-* Important note:
-* The model of the listbox is a CAknFilteredTextListBoxModel.
-* The *itemarray* of that model is this class. That is, whatever is in
-* the model (this class), it may not be visible, if it is filtered out.
-* We always must use the listbox's Model() to get visible ones.
-*/
-const TInt KMaxApSelectorListboxName = KMaxListItemNameLength+KMaxFormatSize;
-
-
-// CLASS DECLARATION
-
-/**
-* Model for the access point listbox. It is an array of CApSelectorItem
-* pointers; items are owned.
-*/
-NONSHARABLE_CLASS( CApSelectorListboxModel ) :
-        public CApListItemList,
-        public MDesCArray
-    {
-    public:     // Construct / destruct
-        enum TGraphicType       /// Events reported to the database observer.
-            {
-            EGraphicNone,       ///< No graphic or icon.
-            EGraphicProtection, ///< Only protected icon.
-            EGraphicBearer,     ///< Bearer specific icon.
-            EGraphicOnOff       ///< Selection specific icon.
-            };
-
-
-        /**
-        * Constructor.
-        * @param aGraphicType   The used graphic type
-        */
-        CApSelectorListboxModel( TGraphicType aGraphicType = EGraphicBearer );
-
-
-        /**
-        * Destructor.
-        */
-        virtual ~CApSelectorListboxModel();
-
-    public:     // from MDesCArray
-
-        /**
-        * Get number of items in the model.
-        * @return Number of items.
-        */
-        TInt MdcaCount() const;
-
-
-        /**
-        * Text to be displayed for this item.
-        * @param aIndex Index of item.
-        * @return TPtrC for this item text (text owned by the model).
-        */
-        TPtrC MdcaPoint( TInt aIndex ) const;
-
-
-    public:
-        
-        /**
-        * index <--> Uid conversion
-        * @param aUid   The UID of the item 
-        * @param aErr   Error code
-        * @return       The index of the item 
-        */
-        TInt Item4Uid( TUint32 aUid, TInt& aErr ) const;
-
-        
-        /**
-        * Sets the icon offset
-        * @param aOffset    The offset of our icons in the iconarray
-        */
-        void SetOwnIconOffset( TInt aOffset );
-
-
-    private:    // data
-        /**
-        * Formats the text of the listbox.
-        * @param aIndex Index of item.
-        * @param aBuf Buffer to store formatted text.
-        */
-        void FormatListboxText( TInt aIndex, TDes& aBuf ) const;
-
-
-        /**
-        * MdcaPoint() cannot leave, so this buffer is allocated
-        * to allow formatting. Fortunately, doesn't have to be very
-        * large.
-        * We have to use MUTABLE CAST, as MdcaPoint is const (odd enough),
-        * so wouldn't allow formatting the text in a member...
-        */
-        __MUTABLE TBuf<KMaxApSelectorListboxName> iBuf;
-
-
-        TGraphicType    iGraphicType;
-        TInt            iOffset;
-        TBool           iFeatureInitialised;
-        TBool           iProtectionSupported;
-    };
-
-
-#endif
-
-// End of file
--- a/apengine/apsettingshandlerui/inc/ApSelectorListbox.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,114 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of class CApSelectorListbox.
-*
-*/
-
-
-#ifndef APSELECTOR_LISTBOX_H
-#define APSELECTOR_LISTBOX_H
-
-// INCLUDE FILES
-#include <aknlists.h>
-
-
-// FORWARD DECLARATION
-class CApSelectorListboxModel;
-
-
-// CLASS DECLARATION
-
-/**
-* Model for the access point listbox. It is an array of CApSelectorItem
-* pointers; items are owned.
-*/
-NONSHARABLE_CLASS( CApSelectorListbox ) : public CAknSingleGraphicStyleListBox
-    {
-    public:     // Construct / destruct
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @param aParent Parent control.
-        * @return The constructed listbox.
-        */
-        static CApSelectorListbox* NewL
-            ( const CCoeControl* aParent );
-
-
-        /**
-        * Destructor.
-        */
-        virtual ~CApSelectorListbox();
-
-
-        /**
-        * Constructor.
-        */
-        CApSelectorListbox();
-
-    public :
-        /**
-        * Handle key event.
-        * @param aKeyEvent The key event.
-        * @param aType Key event type.
-        * @return Response (was the key event consumed?).
-        */
-        TKeyResponse OfferKeyEventL
-            ( const TKeyEvent& aKeyEvent, TEventCode aType );
-
-        /**
-        * Handle focus change.
-        * @param aDrawNow Draw now?
-        */
-        void FocusChanged( TDrawNow aDrawNow );
-
-
-        /**
-        * Loads the icons
-        */
-        void LoadIconsL();
-
-
-        /**
-        * Gets the UID from a given item
-        * @param    The index of the item
-        * @return   The UID of the item given by itemindex
-        */
-        TUint32 Uid4Item( TInt aItem ) const;
-
-
-        /**
-        * Gets the UID of the current item
-        * @return  The UID of the current item
-        */
-        TUint32 CurrentItemUid() const;
-
-
-        /**
-        * Gets the name of the current item
-        * @return The name of the current item
-        */
-        const TDesC& CurrentItemNameL();
-        
-
-        // from CCoeControl
-        void HandleResourceChange(TInt aType);
-
-    };
-
-
-#endif
-
-// End of file
--- a/apengine/apsettingshandlerui/inc/ApSettingsDlg.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1020 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declares dialog for access point view/edit.
-*
-*/
-
-
-#ifndef APSETTINGS_DLG_H
-#define APSETTINGS_DLG_H
-
-
-
-// INCLUDES
-#include <coecntrl.h>
-#include <coeccntx.h>
-
-#include <eiklbo.h>
-#include <eikapp.h>
-#include <eikdoc.h>
-
-#include <AknDialog.h>
-#include <ApSettingsHandlerCommons.h>
-#include <ActiveApDb.h>
-#include <ApAccessPointItem.h>
-#include <ApEngineConsts.h>
-
-
-// CONSTANTS
-const TInt KBearers     = 4;
-
-
-// FORWARD DECLARATIONS
-class CTextOverrides;
-class CEikStatusPane;
-class CAknTitlePane;
-class CAknNavigationControlContainer;
-class CAknNavigationDecorator;
-class CApSettingsModel;
-class CApSettingsHandlerImpl;
-class CFeatureManagerWrapper;
-
-
-// CLASS DECLARATION
-/**
-* CApSettingsDlg dialog class
-*
-*/
-
-const TInt KEndOfArray = -1;
-
-const TInt KCsdAnalogue[]       = { KSpeedAutobaud, KSpeed9600, KSpeed14400, 
-                                    KEndOfArray };
-
-const TInt KCsdAnalogueWcdma[]  = { KSpeedAutobaud, KSpeed9600, KSpeed14400,
-                                    KSpeed28800, KEndOfArray };
-
-const TInt KCsdIsdn110[]        = { KSpeed9600, KSpeed14400, KEndOfArray };
-
-const TInt KCsdIsdn110Wcdma[]   = { KSpeed9600, KSpeed14400, KSpeed28800, 
-                                    KSpeed38400, KEndOfArray };
-
-const TInt KCsdIsdn120[]        = { KSpeed9600, KSpeed14400, KEndOfArray };
-
-const TInt KCsdIsdn120Wcdma[]   = { KSpeed9600, KSpeed14400, KSpeed28800, 
-                                    KSpeed56000, KEndOfArray };
-
-const TInt KHcsdAnalogue[]      = { KSpeedAutobaud, KSpeed9600, KSpeed14400,
-                                    KSpeed19200, KSpeed28800, KEndOfArray };
-
-const TInt KHcsdIsdn110[]       = { KSpeed9600, KSpeed14400, KSpeed19200, 
-                                    KSpeed28800, KSpeed38400, KEndOfArray };
-
-const TInt KHcsdIsdn120[]       = { KSpeed9600, KSpeed14400, KSpeed19200,
-                                    KSpeed28800, KSpeed43200, KEndOfArray };
-
-//Resources
-const TInt KResCsdAnalogue[]        = { R_APUI_VIEW_SPEED_AUTODETECT,
-                                        R_APUI_VIEW_SPEED_9600, 
-                                        R_APUI_VIEW_SPEED_14400, KEndOfArray };
-
-const TInt KResCsdAnalogueWcdma[]   = { R_APUI_VIEW_SPEED_AUTODETECT, 
-                                        R_APUI_VIEW_SPEED_9600, 
-                                        R_APUI_VIEW_SPEED_14400,
-                                        R_APUI_VIEW_SPEED_28800, KEndOfArray };
-
-const TInt KResCsdIsdn110[]         = { R_APUI_VIEW_SPEED_9600,
-                                        R_APUI_VIEW_SPEED_14400, KEndOfArray };
-
-const TInt KResCsdIsdn110Wcdma[]    = { R_APUI_VIEW_SPEED_9600,
-                                        R_APUI_VIEW_SPEED_14400,
-                                        R_APUI_VIEW_SPEED_28800,
-                                        R_APUI_VIEW_SPEED_38400, KEndOfArray };
-
-const TInt KResCsdIsdn120[]         = { R_APUI_VIEW_SPEED_9600, 
-                                        R_APUI_VIEW_SPEED_14400, KEndOfArray };
-
-const TInt KResCsdIsdn120Wcdma[]    = { R_APUI_VIEW_SPEED_9600, 
-                                        R_APUI_VIEW_SPEED_14400,
-                                        R_APUI_VIEW_SPEED_28800, 
-                                        R_APUI_VIEW_SPEED_56000, KEndOfArray };
-
-const TInt KResHcsdAnalogue[]       = { R_APUI_VIEW_SPEED_AUTODETECT, 
-                                        R_APUI_VIEW_SPEED_9600, 
-                                        R_APUI_VIEW_SPEED_14400,
-                                        R_APUI_VIEW_SPEED_19200,
-                                        R_APUI_VIEW_SPEED_28800, KEndOfArray };
-
-const TInt KResHcsdIsdn110[]        = { R_APUI_VIEW_SPEED_9600, 
-                                        R_APUI_VIEW_SPEED_14400, 
-                                        R_APUI_VIEW_SPEED_19200, 
-                                        R_APUI_VIEW_SPEED_28800, 
-                                        R_APUI_VIEW_SPEED_38400, KEndOfArray };
-
-const TInt KResHcsdIsdn120[]        = { R_APUI_VIEW_SPEED_9600, 
-                                        R_APUI_VIEW_SPEED_14400, 
-                                        R_APUI_VIEW_SPEED_19200,
-                                        R_APUI_VIEW_SPEED_28800,
-                                        R_APUI_VIEW_SPEED_43200, KEndOfArray };
-
-NONSHARABLE_CLASS( CApSettingsDlg ) : public CAknDialog, 
-                                      public MEikListBoxObserver, 
-                                      public MActiveApDbObserver
-    {
-
-    public: // Constructors and destructor
-
-        enum TSaveAction
-            {
-            EApCanSave,
-            EApMustDelete,
-            EApShallGoBack,
-            EApNoAction
-            };
-
-        /**
-        * Create and launch dialog.
-        * @param aModel     Model to be used for handling access point data. 
-        *                   Not owned. Must remain intact while the dialog
-        *                   exists.
-        * @param aHandler   The data handling object
-        * @param aUid       The Wap Access Point ID of the access point 
-        *                   to view/edit.
-        * @param aItem      An optional CApAccessPointItem to edit
-        * @return           The code returned by the dialogs' ExecuteLD
-        */
-        TInt ConstructAndRunLD( CApSettingsModel& aModel,
-                                CApSettingsHandlerImpl& aHandler,
-                                TUint32& aUid,
-                                CApAccessPointItem* aItem = NULL );
-
-
-
-        /**
-        * Two-phase construction.
-        * @param aIspFilter         The Isp filter to be used
-        * @param aBearerFilter      The bearer filter to be used
-        * @param aSortType          The sorting to be used
-        * @param aEventStore        A reference to hold the events happened
-        *                           while running this setting dialog.        
-        * @param aNeedIpv6Support Specifies whether the caller would like to 
-        *   have IPv6 support or not. If it is ETrue, in case of IPv6 support
-        *   is available as a feature, it will be supported. If IPv6 feature 
-        *   is not supported by the phone, it simply defaults to the normal 
-        *   IPv4 version.
-        *   If it is False, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        */
-        static CApSettingsDlg* NewL( TInt aIspFilter,
-                                     TInt aBearerFilter,
-                                     TInt aSortType,
-                                     TUint32& aEventStore,
-                                     TInt aNeedIpv6Support = EFalse
-                                     );
-
-
-        /**
-        * Destructor.
-        */
-        ~CApSettingsDlg();
-
-
-        // From CCoeControl
-        TKeyResponse OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                     TEventCode aType ) ;
-
-    protected:
-        /**
-        * Constructor.
-        * @param aIspFilter         The Isp filter to be used
-        * @param aBearerFilter      The bearer filter to be used
-        * @param aSortType          The sorting to be used
-        * @param aEventStore        A reference to hold the events happened
-        *                           while running this setting dialog.        
-        * @param aNeedIpv6Support Specifies whether the caller would like to 
-        *   have IPv6 support or not. If it is ETrue, in case of IPv6 support
-        *   is available as a feature, it will be supported. If IPv6 feature 
-        *   is not supported by the phone, it simply defaults to the normal 
-        *   IPv4 version.
-        *   If it is False, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        */
-        CApSettingsDlg(  TInt aIspFilter,
-                         TInt aBearerFilter,
-                         TInt aSortType,
-                         TUint32& aEventStore,
-                         TBool aNeedIpv6Support
-                         );
-
-
-
-    public: // New functions
-
-        /**
-        * Initialises texts.
-        */
-        void InitTextsL();
-
-
-        /**
-        * Handles listbox data change
-        * @param aReRead Boolean indicating whether the data must be re-read
-        * from the database or only 'value' or 'structural' changes
-        */
-        void HandleListboxDataChangeL( TBool aReRead );
-
-
-        /**
-        * Sets the text overrides
-        * @param aOverrides The text overrides object to be used
-        */
-        void SetTextOverrides( CTextOverrides* aOverrides );
-
-
-        /**
-        * Handles database events, implementation of the
-        * MActiveApDbObserver protocol
-        * @param anEvent The event code
-        */
-        virtual void HandleApDbEventL( TEvent anEvent );
-
-        // From CCoeControl
-        virtual void GetHelpContext(TCoeHelpContext& aContext) const;
-
-    private:
-
-        // From CEikDialog
-        virtual void PreLayoutDynInitL();
-
-        // From CAknDialog
-        TBool OkToExitL( TInt aButtonId );
-
-        // From MEikCommandObserver
-        virtual void ProcessCommandL( TInt aCommandId ) ;
-
-        // From MEikMenuObserver
-        virtual void DynInitMenuPaneL( TInt aResourceId, 
-                                       CEikMenuPane* aMenuPane ) ;
-
-        // From MEikListBoxObserver
-        void HandleListBoxEventL( CEikListBox* aListBox, 
-                                  TListBoxEvent aEventType );
-
-    protected:  // New functions
-
-        /**
-        * Fills up the listbox with data
-        * @param aItemArray     The itemarray to fill up
-        * @param arr            A pointer to a TApMember array to be used as 
-        *                       list elements
-        * @param aLength        The number of elements in the above array
-        * @param aRes           A pointer to an array of resource ID's to use 
-        *                       for the elements of the TApMember array
-        * @param aCompulsory    A pointer to an array of TInts indicating that
-        *                       the elements of the TApMember array are 
-        *                       compulsory or not
-        */
-        void    FillListWithDataL
-                    (
-                    CDesCArrayFlat& aItemArray,
-                    const TApMember& arr,
-                    TInt aLength,
-                    const TInt* aRes,
-                    const TInt* aCompulsory
-                    );
-
-
-
-        /**
-        * Adds one textual listbox item for the given member
-        * @param aItemArray     The itemarray to add the item        
-        * @param aMember        A TApMember value specifying which member of 
-        *                       the access point had to be added to the list
-        * @param aRes           Resource ID for the 'title text' for this 
-        *                       member
-        * @param aCompulsory    a TInt indicating whether this member is 
-        *                       compulsory or not
-        */
-        void    AddTextualListBoxItemL
-                        (
-                        CDesCArrayFlat& aItemArray,
-                        TApMember aMember,
-                        TInt aRes,
-                        TInt aCompulsory
-                        );
-
-
-        /**
-        * Adds one 'on/off' listbox item for the given member
-        * @param aItemArray     The itemarray to add the item        
-        * @param aMember        A TApMember value specifying which member of
-        *                       the access point had to be added to the list
-        * @param aRes           Resource ID for the 'title text' for this 
-        *                       member
-        * @param aCompulsory    TInt showing if the member is compulsory or not
-        */
-        void    AddOnOffListBoxItemL
-                        (
-                        CDesCArrayFlat& aItemArray,
-                        TApMember aMember, TInt aRes,
-                        TInt aCompulsory
-                        );
-
-
-        /**
-        * Updates one 'on/off' listbox item for the given member
-        * @param aMember A TApMember value specifying which member of the
-        * access point had to be added to the list
-        * @param aRes Resource ID for the 'title text' for this member
-        * @param aPos The current position of the item in the list
-        * @param aCompulsory a TInt indicating whether
-        * this member is compulsory or not
-        */
-        void    UpdateOnOffListBoxItemL( TApMember aMember, TInt aRes,
-                                         TInt aPos, TInt aCompulsory );
-
-
-        /**
-        * Updates one 'textual' listbox item for the given member
-        * @param aMember A TApMember value specifying which member of the
-        * access point had to be added to the list
-        * @param aRes Resource ID for the 'title text' for this member
-        * @param aPos The current position of the item in the list
-        * @param aCompulsory a TInt indicating whether
-        * this member is compulsory or not
-        */
-        void    UpdateTextualListBoxItemL( TApMember aMember, TInt aRes,
-                                        TInt aPos, TInt aCompulsory );
-
-
-        /**
-        * Creates one 'textual' listbox item for the given member
-        * @param aMember A TApMember value specifying which member of the
-        * access point had to be added to the list
-        * @param aRes Resource ID for the 'title text' for this member
-        * @param aCompulsory a TInt indicating whether
-        * this member is compulsory or not
-        * @return A HBufC* pointing to the created listbox item text.
-        */
-        HBufC*  CreateTextualListBoxItemL( TApMember aMember, TInt aRes,
-                                        TInt aCompulsory );
-
-
-        /**
-        * Creates one 'on/off' listbox item for the given member
-        * @param aMember A TApMember value specifying which member of the
-        * access point had to be added to the list
-        * @param aRes Resource ID for the 'title text' for this member
-        * @param aCompulsory a TInt indicating whether
-        * this member is compulsory or not
-        * @return A HBufC* pointing to the created listbox item text.
-        */
-        HBufC*  CreateOnOffListBoxItemL( TApMember aMember, TInt aRes,
-                                        TInt aCompulsory );
-
-
-        /**
-        * Changes one setting. The setting, which is
-        * highlighted as current in the listbox is changed.
-        * @param aQuick a TBool indicating whether a 'quick' change is needed
-        * or not. Quick changes are not bring up any setting dialog but simply
-        * change the current value to the next available one.
-        * This can be used only for 'on/off' type settings
-        */
-        void    ChangeSettingsL( TBool aQuick );
-
-
-        /**
-        * Sets the internal bearer type, list is re-arranged according to the
-        * newly set bearer type
-        * @param aBearer The new bearertype
-        */
-        void    SetBearerTypeL( TApBearerType aBearer );
-
-
-        /**
-        * Inverts one boolean member of the access point
-        * @param aData the member to invert.
-        * if the member does not exists,
-        * or not a boolean memeber, code will _ASSERT_DEBUG
-        */
-        void    InvertSettingsL( TApMember aData );
-
-
-        /**
-        * Shows a popup setting page (radio buttons) for the given member
-        * @param aDataMember The access point member which need to be changed
-        * @return A boolean indicating whether the current setting
-        * had been changed or not.
-        */
-        TBool   ShowPopupSettingPageL( TApMember aDataMember );
-
-
-        /**
-        * Shows a popup text setting page for the given member
-        * @param aDataMember The access point member which need to be changed
-        * @return A boolean indicating whether the current setting
-        * had been changed or not.
-        */
-        TBool   ShowPopupTextSettingPageL( TApMember aData );
-
-
-        /**
-        * Gets the text for the passed (text-type) member.
-        * @param aDataMember The access point member for which to get the text
-        * @return a HBufC* to the newly allocated text.
-        * Text is placed onto the CleanupStack. Ownership passed to caller.
-        */
-        HBufC*  GetTextLC( TApMember aData );
-
-
-        /**
-        * Gets the resource ID for the passed (text-type) member
-        * along with the setting page flags
-        * @param aDataMember    The access point member for which to get 
-        *                       the resource ID
-        * @param aTextSettingPageFlags A reference to hold the setting 
-        *                       page flags for the given member
-        */
-        void    GetTextResId( TApMember aData, TInt& apage,
-                              TInt& aTextSettingPageFlags );
-
-
-        /**
-        * Gets the resource ID for the passed (NOT text-type) member
-        * @param aDataMember    The access point member for which to get 
-        *                       the resource ID
-        * @param aattr          A reference to hold the resource ID
-        *                       for the given member
-        */
-        void    GetResId( TApMember aData, TInt& aattr );
-
-
-        /**
-        * Fills up a pop-up radio button setting page with the currently
-        * valid and available choices for the given member.
-        * @param aData The member whose chances are needed
-        * @param aCurrvalue The current value of the setting
-        * @return An array of choices for the given member,
-        * pushed to the CleanupStack.
-        */
-        CDesCArrayFlat* FillPopupSettingPageLC( TApMember aData,
-                                                TInt& aCurrvalue );
-
-
-        /**
-        * Updates the given member's data with the new
-        * setting from the setting page.
-        * @param aData the member to update
-        * @param aCurrvalue The new value
-        */
-        void    UpdateFromPopupSettingPageL( TApMember aData, 
-                                             TInt aCurrvalue );
-
-
-        /**
-        * Returns whether the access point in question can be saved or not.
-        * If a compulsory item is missing, user is prompted whether to delete
-        * it or to go back for re-editing.
-        * @param aDataNeeded If the AP can not be saved because a compulsory
-        * item is missing, this holds the TApMember which is not filled.
-        * It lists always the first item causing the 'failure'.
-        * @return a TSaveAction indicating whether it can be saved,
-        * must re-edit or must be deleted.
-        */
-        TSaveAction CanSaveL( TApMember& aDataNeeded );
-
-
-        /**
-        * Handles IP address editing of the given field
-        * Brings up the IP address editor page, fills up with the current
-        * value, handles editing and after editing, it stores the new value
-        * in the AP item.
-        * @param aData The (IP-address) member which needs to be changed
-        */
-        void    ShowPopupIpAddrSettingPageL( TApMember aData );
-
-
-        /**
-        * Handles phone number editing of the given field
-        * Brings up the phone number editor page, fills up with the current
-        * value, handles editing and after editing, it stores the new value
-        * in the AP item.
-        * In case the entered phone number is invalid, an 'invalid number'
-        * note is shown and original value is kept.
-        * @param aData The (phone-number) member which needs to be changed
-        */
-        void    ShowPopupPhoneNumSettingPageL( TApMember aData );
-
-
-        /**
-        * Handles password setting
-        * Brings up the password editor page, handles editing
-        * and after editing, it stores the new value in the AP item.
-        * @param a TApMember specifying the member
-        */
-        void    ShowPopupPasswordPageL( TApMember aData );
-
-
-        /*
-        * Reads up a Boolean type data, ensures that it is in the
-        * required range (0 or 1)
-        * @param aData The member to get
-        * @param aInvert Whether the logic is inverted or not
-        * @param aCurrvalue The current value
-        */
-        void    GetBoolDataValue( TApMember aData, TBool aInvert,
-                                  TInt& aCurrvalue );
-    private:
-
-        /**
-        * Does the bearer change according to
-        * the current value of the selection
-        * @param a TInt specifying the current value
-        */
-        void    DoBearerChangeL( TInt aCurrvalue );
-
-
-        /**
-        * Handles bearer change.
-        * Sets AP item bearer type, re-reads AP data, re-arranges listbox
-        * according to the new bearer type
-        * @param aBearer A TApBearerType specifying the current bearer.
-        */
-        void    HandleBearerChangeL( TApBearerType aBearer );
-
-
-        /*
-        * This part holds functions available only in the case of 
-        * 'multiple bearer support', that means that 
-        * as long as the user does not saves the AP, multiple instances of
-        * the same AP are kept with different bearers...
-        */
-
-        /**
-        * Returns the array index for a bearer type
-        * @param aBearer    The bearer type to get the index of
-        * @return The index
-        */
-        TInt32  BearerToArrayIndexL( TApBearerType aBearer );
-
-        
-        /**
-        * Returns the bearer type for an index
-        * @param aIndex The index to get the bearer type for
-        * @return The bearer type
-        */
-        TApBearerType ArrayIndexToBearer( TInt32 aIndex );
-
-
-        /**
-        * Fills the passed array with the possible bearer speed values.
-        * Array MUST be empty to get correct result as speed values are
-        * simply APPENDED to the end of the list.
-        * Adds only valid and available values according to the current
-        * bearer type and call type.
-        * @param aItems The array to hold the bearer speed values
-        * @param aCurrvalue The index of the current speed value
-        */
-        void    FillUpBearerSpeedValuesL( CDesCArrayFlat& aItems,
-                                          TInt& aCurrvalue );
-
-
-        /**
-        * Tries to save current access point data.
-        * Checks if the data can be saved: each compulsory fields are filled,
-        * Name is valid and does not exist already.
-        * If data can not be saved, pops up query about delete? Yes/No
-        * If user choses delete, AP will be deleted.
-        * If user chooses NO, the 'faulty' item will be highlighted in the
-        * list and it will return to the setting list, giving a chance to edit
-        * the faulty/missing data.
-        * @return Whether the 'Save' procedure had been successfull or not.
-        * It also means that if the user had choosen 'Delete', after deleting
-        * the AP it will return 'ETrue' indicating successfull operation.
-        */
-        TBool   SaveDataL( );
-
-
-        /**
-        * Handles list structure changes.
-        * Refreshes the list of members needed to represent the current AP and
-        * the current settings.
-        */
-        void    HandleListStructureChangeL();
-
-
-        /**
-        * This function 'limits' the connection speed after a bearertype or
-        * calltype change so the current bearer speed will be always valid.
-        */
-        void    LimitSpeed();
-
-
-        /**
-        * Selects one item of the listbox.
-        * @param aItemIndex The index of the item to be select.
-        */
-        void    SelectItem( TInt aItemIndex );
-
-
-
-        /*
-        * Converts EParagraphDelimiter-s to /n-s
-        * Returned text is owned by the caller!
-        * @param aInText The original text where replacement is needed
-        * @return A new HBufC (pushed to the CleanupStack) with
-        * the modified text
-        */
-        HBufC* ConvertDelimToPerNLC( const TDesC& aInText );
-
-
-        /*
-        * Converts /n-s to EParagraphDelimiter-s
-        * Returned text is owned by the caller!
-        * @param aInText The original text where replacement is needed
-        * @return A new HBufC (pushed to the CleanupStack) with
-        * the modified text
-        */
-        HBufC* ConvertPerNToDelimLC( const TDesC& aInText );
-
-
-        /**
-        * Changes one setting. The setting, which is
-        * highlighted as current in the listbox is changed.
-        * @param aQuick a TBool indicating whether a 'quick' change is needed
-        * or not. Quick changes are not bring up any setting dialog but simply
-        * change the current value to the next available one.
-        * This can be used only for 'on/off' type settings
-        */
-        void DoChangeSettingsL( TBool aQuick );
-
-
-        /**
-        * Converts the selected speed index to the current speed value
-        * based on the bearer type (CSD/HSCSD) and whether it is analogue,
-        * ISDN v110 or ISDN v120
-        * @param aCurrvalue TInt The current selection index
-        * @return The TApCallSpeed value
-        */
-        TApCallSpeed GetBearerSpeedForSelection( TInt aCurrvalue );
-
-
-        /**
-        * Calculates the index for the current speed value
-        * based on the bearer type (CSD/HSCSD) and whether it is analogue,
-        * ISDN v110 or ISDN v120
-        * @return TInt the index of the current speed in the list
-        */
-        TInt GetCurrIndexFromBearerSpeed( );
-
-
-        /**
-        * Converts whitespace characters to spaces
-        * Returned text is owned by the caller!
-        * @param aInText The original text where replacement is needed
-        * @return A new HBufC (pushed to the CleanupStack) with
-        * the modified text
-        */
-        HBufC* ReplaceWhiteSpaceCharactersLC(  const TDesC& aInText );
-
-
-        void ChangeNetworkGroupL();
-
-
-        /**
-        * Gets the shareddata value whether HSCSD is enabled or not
-        * @return A TInt stating if it is enabled (1) or not (0)
-        */
-        TInt IsHSCSDEnabledL();
-
-
-        /**
-        * Gets the CSD settings array according to the passed variant
-        * It sets member pointers to Field, Title & Compulsory values
-        * @param variant    Variant
-        */
-        void GetCSDSettingArrays( TInt variant );
-
-
-        /**
-        * Gets the GPRS settings array according to the passed variant
-        * It sets member pointers to Field, Title & Compulsory values
-        * @param aVariant    Variant
-        */
-        void GetGPRSSettingArrays( TInt aVariant );
-
-        
-        /**
-        * Gets the WLAN settings array according to the passed variant
-        * It sets member pointers to Field, Title & Compulsory values
-        * @param variant    Variant
-        */
-        void GetWLANSettingArraysL( TInt variant );
-
-
-        /**
-        * Asks a query if wcdma speed had been selected.
-        * only checks if a speed-related member had been changed.
-        * @param aMember    The member which had been changed
-        * @param aCurrValue The current value of the setting
-        * @return   Whether the query had been accepted or not. 
-        *           Default return value is ETrue
-        */
-        TBool AskQueryIfWcdmaL( TApMember aMember, TInt aCurrvalue  );
-
-
-        /**
-        * Displays the domain name servers data query 
-        * @param AIp6 Determines whether ip4 or ip6 query is to be launched.
-        * Internally takes care about whether IP6 is supported or not.
-        * If IP4 is selected, it uses IP address editor.
-        * If IP6 is selected, it uses standard text editor.
-        * @return The result of the dialog's ExecuteLD
-        */
-        TInt GetNameServersL( TBool aIp6 );
-
-
-        /**
-        * Adds one 'Menu' listbox item (which will open another setting list)
-        * for the given member.
-        * @param aMember A TApMember value specifying which member of the
-        * access point had to be added to the list
-        * @param aRes Resource ID for the 'title text' for this member
-        * @param aCompulsory a TInt indicating whether
-        * this member is compulsory or not
-        */
-        void AddMenuListBoxItemL( 
-                                CDesCArrayFlat& aItemArray,
-                                TApMember aMember,
-                                TInt aRes,
-                                TInt aCompulsory
-                                );
-
-
-        /**
-        * Returns the current domain name server type
-        * It can be 3: Dynamic, Well-known, User defined
-        * Return values are 0, 1, 2, respectively
-        */
-        TInt GetDomainNameServersTypeL();
-
-
-        /**
-        * Pops up an IPv4 IP address multiline query
-        * IP address is entered into IPv4 address editors
-        * @return Returns the returned value of the multiline query
-        */
-        TInt GetIpv4NameServerL();
-
-
-        /**
-        * Pops up an IPv6 IP address multiline query
-        * IP address is entered into TEXT editors
-        * @return Returns the returned value of the multiline query
-        */
-        TInt GetIpv6NameServerL();
-
-
-        /**
-        * Returns the current domain name server type for IPv6 type
-        * It can be 3: Dynamic, Well-known, User defined
-        * Return values are 0, 1, 2, respectively
-        */
-        TInt GetIPv6DNSTypeL();
-
-
-        /**
-        * Returns the current domain name server type for IPv4 type
-        * It can be 3: Dynamic, Well-known, User defined
-        * Return values are 0, 1, 2, respectively
-        */
-        TInt GetIPv4DNSTypeL();
-
-
-        /**
-        * Strips non-number chars from the passed text
-        * @return a HBufC8 holding the new text
-        */
-        HBufC* StripNonNumberLC( const TDesC16& aInText );
-
-
-        /**
-        * Returns the index for the given bearertype in the list of 
-        * currently available bearer types.
-        * Leaves with KErrNotSupported if the passed bearer type currently 
-        * is not supported
-        */
-        TInt BearerType2BearerItemPosL( TApBearerType aBearer );
-
-
-        /**
-        * Returns the bearer type for the given position in the list of 
-        * currently available bearer types.
-        * @param The position in the list
-        * @return The bearer type of the item bbeing in aPos position
-        */
-        TApBearerType BearerItemPos2BearerTypeL( TInt aPos );
-
-
-        /**
-        * Changes WLAN network name.
-        */
-        void ChangeWlanNetworkNameL();
-
-
-        /**
-        * Changes WLAN security settings.
-        * @return TInt giving exit or shutdown required if any, otherwise, 0
-        */
-        TInt ChangeWlanSecuritySettingsL();
-
-
-        /**
-        * Changes WEP security settings.
-        * Leaves on errors.
-        * @return TInt giving exit or shutdown required if any, otherwise, 0
-        */
-        TInt ChangeWepSecuritySettingsL();
-
-
-        /**
-        * Changes WPA security settings.
-        * Leaves on errors.
-        * @return TInt giving exit or shutdown required if any, otherwise, 0
-        */
-        TInt ChangeWpaSecuritySettingsL();
-
-
-        /**
-        * Changes 802.1x security settings.
-        * Leaves on errors.
-        * @return TInt giving exit or shutdown required if any, otherwise, 0
-        */
-        TInt Change8021xSecuritySettingsL();
-
-
-        /**
-        * Returns whether WLAN is supported or not.
-        * @return a boolean indicating whether WLAN is supported or not.
-        */
-        TBool IsWlanSupported();
-
-
-        /**
-        * Get the Wlan network name with a popup query
-        * @return A boolean indicating whether the current setting
-        * had been changed or not.
-        */
-        TBool QueryWlanNetworkNameL();
-
-
-        /**
-        * @return Whether the EApIspIPNetMask and EApIspIPGateway fields 
-        * are visible in the settings or not.
-        */
-        TBool IsNetMaskAndGatewayVisibleL();
-
-        
-        /**
-        * Returns the ad-hoc channel number asked from the user
-        */
-        TUint32 GetAdHocChannelL();
-        
-        
-        /**
-        * Returns whether the ad-hoc channel ID is visible or not
-        */
-        TBool IsAdhocChannelVisible();
-        
-        
-        /**
-        * Returns whether the security settings are filled correctly in case
-        * of a WLAN access point or not.
-        */
-        TBool HasSecuritySettingsFilledL();
-        
-        
-        /**
-        * Limits the security mode when the network mode has changed.
-        * In case of infrastructure, it should not be called
-        * In case of Ad-hoc, it should be called and it will limit the
-        * current security mode into the curren range, which is EOpen and EWep
-        *
-        */
-        void LimitSecMode();
-        
-        
-        /**
-        * Returns whether the access point in question can be saved or not.
-        * If a compulsory item is missing, user is prompted whether to quit 
-        * without saving it or to go back for re-editing.
-        * @param aDataNeeded If the AP can not be saved because a compulsory
-        * item is missing, this holds the TApMember which is not filled.
-        * It lists always the first item causing the 'failure'.
-        * @return a TSaveAction indicating whether it can be saved,
-        * must re-edit or must be quited(deleted).
-        */
-        TSaveAction CanSaveWlanCompulsoriesL( TApMember& aDataNeeded );
-        
-        /**
-        * Restores Ipv4 settings to iApItem from iBackupApItem.
-        */
-        void RestoreIpv4SettingsL();
-        
-protected:  // Functions from base classes
-
-
-
-    private: //data
-        TUint32*                        iUid;
-
-        TUint32                         iLevel;         // current level
-        // when leaving level 0, the two indexes are stored: top & current
-        // to enable getting back to the same position & state
-        TInt                            iOldIndex;    // current index
-        TInt                            iOldTopIndex;   // top index
-
-        TInt                            iAdvIndex;
-
-        TApBearerType                   iBearerType;
-        TInt                            iIspFilter;
-        TInt                            iBearerFilter;
-        TInt                            iSortType;
-
-        CEikStatusPane*                 iStatusPane;    // NOT owned
-        CAknTitlePane*                  iTitlePane;     // NOT owned
-        CAknNavigationControlContainer* iNaviPane;      // NOT owned
-        CAknNavigationDecorator*        iNaviDecorator; // owned
-
-        HBufC*                          iOldTitleText;
-
-        CApSettingsModel*               iDataModel;     // NOT owned
-
-        CAknSettingStyleListBox*        iList;      // owned through resources,
-                                                    // destroyed automatically 
-                                                    // by the dialog
-
-        CApAccessPointItem*             iApItem;        // owned
-        CApAccessPointItem*             iOldApItem;     // owned
-        TUint32*                        iEventStore;
-
-        CArrayPtrFlat<CApAccessPointItem>*  iBearerItemArray; // owned
-
-        TApMember*                      iField;
-        TApMember*                      iFieldAdvanced;
-        TApMember*                      iFieldL2;
-        TInt                            iFieldCount;
-        TInt                            iAdvancedFieldCount;
-        TInt                            iFieldCountL2;
-        TInt*                           iTitles;
-        TInt*                           iTitlesAdvanced;
-        TInt*                           iTitlesL2;
-        TInt*                           iCompulsory;
-        TInt*                           iCompulsoryAdvanced;
-        TInt*                           iCompulsoryL2;
-        TApUiExitReason                 iExitReason;
-
-        CDesCArrayFlat*                 iItemArray; // not owned
-
-        CTextOverrides*                 iTextOverrides;// does not owns it, 
-                                                       // just passed for usage
-        CApSettingsHandlerImpl*         iHandler;
-
-        TInt                            iReqIpvType;    // Default is IPv4
-        TBool                           iL2Ipv4;        // Default is NO 
-        TInt                            iVariant;       /// Local variant value
-       
-        /**
-        * CFeatureManagerWrapper wraps FeatureManager to eliminate maintenance 
-        * of existance of FeatureManager.
-        * Owned.
-        */
-        CFeatureManagerWrapper*         iFeatureManagerWrapper; 
-
-
-#ifdef __TEST_OOMDEBUG
-        TBool                           iMemTestOn;
-#endif // __TEST_OOMDEBUG
-        TInt                            iSecSettingsExitReason;
-        TApBearerType                   iOriginalBearerType;
-        
-        CApAccessPointItem*             iBackupApItem;     // owned
-        TBool							iHelpSupported;
-    };
-
-#endif
-
-// End of File
--- a/apengine/apsettingshandlerui/inc/ApSettingsHandlerConsts.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,86 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Contains common internal consts, typedefs for the Access Point settings.
-*
-*/
-
-
-#ifndef APSETTINGS_HANDLER_CONSTS_H
-#define APSETTINGS_HANDLER_CONSTS_H
-
-// CONSTANTS
-
-#define KMaxConnNameLength            30
-#define KMaxGprsApNameLength          100
-#define KMaxLoginNameLength           50
-#define KMaxStartPageLength           1000
-#define KMaxAccessNumLength           21
-#define KCBInfoLength                 21
-#define KMaxServiceCentreAddrLength   21
-#define KMaxServiceAccessNumLength    21
-#define KMaxLoginScriptLength         1000
-#define KMaxLoginPasswordLength       50
-#define KMaxModInitStringLength       50
-#define KMaxProxyServerLength         1000
-#define KMaxProxyPortNumberLength     5
-#define KMaxNetworkNameLength         50
-#define KMaxIPv6NameServerLength      40
-#define KMaxIPv4NameServerLength      12
-#define KMaxWlanNetworkameLength      32
-#define KMaxAdhocChannelNumberLength  2
-#define KAdhocChannelMin              1
-#define KAdhocChannelMax              11
-
-#define KConnNameWidth                10
-#define KGprsApNameWidth              10
-#define KLoginNameWidth               10
-#define KStartPageWidth               10
-#define KAccessNumWidth               10
-#define KCBInfoWidth                  10
-#define KServiceCentreAddrWidth       10
-#define KServiceAccessNumWidth        10
-#define KIpAddressWidth               10
-#define KLoginScriptWidth             10
-#define KModInitStringWidth           10
-#define KProxyServerWidth             10
-#define KProxyPortNumberWidth         10
-#define KNetworkNameWidth             10
-
-
-#define KConnNameLines                2
-#define KGprsApNameLines              2
-#define KLoginNameLines               2
-#define KStartPageLines               2
-#define KAccessNumLines               2
-#define KCBInfoLines                  2
-#define KServiceCentreAddrLines       2
-#define KServiceAccessNumLines        2
-#define KIpAddressLines               2
-#define KLoginScriptLines             2
-#define KModInitStringLines           2
-#define KProxyServerLines             2
-#define KProxyPortNumberLines         2
-#define KNetworkNameLines             1
-
-
-
-
-#define KListQueryHeight              6
-#define KListQueryWidth               2
-
-#endif
-
-
-// End of File
--- a/apengine/apsettingshandlerui/inc/ApSettingsHandlerLogger.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,164 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*       Implemented logger functionality of the module
-*
-*/
-
-
-#ifndef APSETTINGSHANDLER_LOGGER_H
-#define APSETTINGSHANDLER_LOGGER_H
-
-
-
-// INCLUDE FILES
-
-#include <flogger.h>
-#include <eikenv.h>
-
-
-// CONSTANTS
-
-const TInt KApSetUIMajorVersion = 4;
-const TInt KApSetUIMinorVersion = 0;
-const TInt KApSetUIBuildVersion = 16;
-
-_LIT( KApSetUILogMessageAppBanner,   "ApSetUI: (%d.%d.%d) started" );
-_LIT( KApSetUILogEnterFn,            "ApSetUI: -> %S" );
-_LIT( KApSetUILogLeaveFn,            "ApSetUI: <- %S" );
-_LIT( KApSetUILogExit,               "ApSetUI: exit" );
-_LIT( KApSetUILogTimeFormatString,   "%H:%T:%S:%*C3" );
-
-// NOTE! We're depending on FLogger DLL, because it assumes the existence
-// of C:\LOGS directory.
-_LIT( KApSetUIFLoggerDependency,        "c:\\logs\\" );
-_LIT( KApSetUIDoubleBackSlash,      "\\" );
-_LIT( KApSetUILogDir,                "data" );
-_LIT( KApSetUILogFile,               "apui.log" );
-
-
-    enum TApSetUiLogMask                ///< Log mask bits.
-        {
-        ELogOff         = 0x00000000,   ///< Don't log.
-        EDelete         = 0x00000001,   ///< Log delete activity.
-        ESettings       = 0x00000002,   ///< Log Settings
-        EListbox        = 0x00000004,   ///< Log listbox activity.
-        EModel          = 0x00000008,   ///< Log Model activity.
-        EAPI            = 0x00000010,   ///< Log API activity.
-        EApImpl         = 0x00000020,   ///< Log Implementation activity.
-        EDialog         = 0x00000040,   ///< Log dialog activity.
-        EOther          = 0x00000080,   ///< Log other activity.
-        /*
-        EApItem         = 0x00000040,   ///< Log ApItem activity.
-        ECommons        = 0x00000080,   ///< Log transaction activity.
-        EActiveDb       = 0x000000F0,   ///< Log active db & notification 
-                                        ///< activity.
-        */
-        ESpecial        = 0x0FFFF000,   ///< Log special, temp stuff only
-        ELogAll         = 0xFFFFFFFF    ///< Log all.
-        };
-
-    // MACROS
-
-    /// Determines what to log. Construct this from TApSetUiLogMask values.
-//    #define APSETUI_LOG_MASK ELogAll
-//    #define APSETUI_LOG_MASK    EDelete + EModel + EListbox
-//    #define APSETUI_LOG_MASK    EDelete + EModel
-// #define APSETUI_LOG_MASK ESettings +EListbox +EModel +EAPI +EApImpl +EDialog +EOther
-    #define APSETUI_LOG_MASK    EModel
-    
-
-#ifdef __TEST_LOGGING
-    #define APSETUILOGGER_CREATE { \
-                TFileName path( KApSetUIFLoggerDependency );    \
-                path.Append( KApSetUILogDir );                  \
-                path.Append( KApSetUIDoubleBackSlash );         \
-                RFs& fs = CEikonEnv::Static()->FsSession();     \
-                fs.MkDirAll( path );                            \
-                RFileLogger::WriteFormat( KApSetUILogDir, KApSetUILogFile,  \
-                                          EFileLoggingModeOverwrite,        \
-                                          KApSetUILogMessageAppBanner,      \
-                                          KApSetUIMajorVersion,             \
-                                          KApSetUIMinorVersion,             \
-                                          KApSetUIBuildVersion ); }         
-    #define APSETUILOGGER_DELETE {                          \
-                RFileLogger::Write( KApSetUILogDir,         \
-                                    KApSetUILogFile,        \
-                                    EFileLoggingModeAppend, \
-                                    KApSetUILogExit ); }
-    #define APSETUILOGGER_ENTERFN( mask, a ) {                              \
-                _LIT( temp, a );                                            \
-                if (mask & APSETUI_LOG_MASK)                                \
-                    {                                                       \
-                    RFileLogger::WriteFormat( KApSetUILogDir,               \
-                                              KApSetUILogFile,              \
-                                              EFileLoggingModeAppend,       \
-                                              KApSetUILogEnterFn, &temp );  \
-                    } }
-    #define APSETUILOGGER_LEAVEFN( mask, a ) {                              \
-                _LIT( temp, a );                                            \
-                if (mask & APSETUI_LOG_MASK)                                \
-                    {                                                       \
-                    RFileLogger::WriteFormat( KApSetUILogDir,               \
-                                              KApSetUILogFile,              \
-                                              EFileLoggingModeAppend,       \
-                                              KApSetUILogLeaveFn, &temp );  \
-                    } }
-    #define APSETUILOGGER_WRITE( mask, a ) {                                \
-                _LIT( temp, a );                                            \
-                if (mask & APSETUI_LOG_MASK)                                \
-                    {                                                       \
-                    RFileLogger::Write( KApSetUILogDir,                     \
-                                        KApSetUILogFile,                    \
-                                    EFileLoggingModeAppend, temp );         \
-                    } }
-    #define APSETUILOGGER_WRITE_FORMAT( mask, a, b ) {                      \
-                _LIT( temp, a );                                            \
-                if (mask & APSETUI_LOG_MASK)                                \
-                    {                                                       \
-                    RFileLogger::WriteFormat( KApSetUILogDir,               \
-                                              KApSetUILogFile,              \
-                                              EFileLoggingModeAppend,       \
-                                              temp, b );                    \
-                    } }
-    #define APSETUILOGGER_WRITE_TIMESTAMP( mask, a ) {                      \
-                _LIT( temp, a );                                            \
-                if (mask & APSETUI_LOG_MASK)                                \
-                    {                                                       \
-                    TTime time; TBuf<48> buf; time.HomeTime();              \
-                    time.FormatL( buf, KApSetUILogTimeFormatString );       \
-                    buf.Insert( 0, temp );                                  \
-                    RFileLogger::Write( KApSetUILogDir, KApSetUILogFile,    \
-                    EFileLoggingModeAppend, buf);                           \
-                    } }
-    #define APSETUILOGGER_WRITE_BUF( mask, a ) {                            \
-                if (mask & APSETUI_LOG_MASK)                                \
-                    {                                                       \
-                    RFileLogger::Write( KApSetUILogDir, KApSetUILogFile,    \
-                                        EFileLoggingModeAppend, a);         \
-                    } }
-#else
-    #define APSETUILOGGER_CREATE {}
-    #define APSETUILOGGER_DELETE {}
-    #define APSETUILOGGER_ENTERFN( mask, a ) {}
-    #define APSETUILOGGER_LEAVEFN( mask, a ) {}
-    #define APSETUILOGGER_WRITE( mask, a ) {}
-    #define APSETUILOGGER_WRITE_FORMAT( mask, a, b ) {}
-    #define APSETUILOGGER_WRITE_TIMESTAMP( mask, a ) {}
-    #define APSETUILOGGER_WRITE_BUF( mask, a ) {}
-#endif // __TEST_LOGGING
-
-#endif // APSETTINGSHANDLER_LOGGER_H
-
-// End of file
--- a/apengine/apsettingshandlerui/inc/ApSettingsHandlerUI.hrh	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,62 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     This file contains declarations for resources of ApSettingsHandlerUi.
-*     The file can be included in C++ or resource file.
-*
-*/
-
-
-#ifndef APSETTINGSHANDLER_HRH
-#define APSETTINGSHANDLER_HRH
-
-#define  KApSelectorListboxType     16543
-#define  KApSettingsListboxType     6544
-
-enum TApSelectorMenuCommands
-    {
-    EApSelCmdSelect = 1234,
-    EApSelCmdOpen,
-    EApSelCmdNew,
-    EApSelCmdNewBlank,
-    EApSelCmdNewUseExisting,
-    EApSelCmdDelete,
-    EApSelCmdExit,
-    EApSelCmdChange,
-    EApSelCmdAdvanced,
-
-    // query commands
-    EApUiCmdRetry,
-    EApUiCmdCancel,
-    
-    EApSelCmdQuickChange
-    };
-
-
-
-
-enum TApSelectorDllDlgLineId // dialog line IDs
-    {
-    KApSelectorListboxId = 2,
-    KApSettingsListboxId,
-    KApGeneralNote,
-    KApWaitNote
-    };
-
-
-
-
-#endif      //  APSELECTOR
-
-// End of File
--- a/apengine/apsettingshandlerui/inc/ApSettingsHandlerUiPrivateCRKeys.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,26 +0,0 @@
-/*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:
-*
-*/
-#ifndef APSETTINGSHANDLERUIPRIVATECRKEYS_H
-#define APSETTINGSHANDLERUIPRIVATECRKEYS_H
-
-const TUid KCRUidApSettingsHandlerUiLV = {0x10008D3B};
-
-// Local variation for ApSettingsHandlerUi
-const TUint32 KApSettingsHandlerUiLVFlags =            0x00000001;
-
-
-#endif      // APSETTINGSHANDLERUIPRIVATECRKEYS_H
\ No newline at end of file
--- a/apengine/apsettingshandlerui/inc/ApSettingsLookups.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,981 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*       This file containes the lookup-information for the ApSettingsDlg.
-*       Gives the order of the fields, number of the fields, etc.
-*
-*/
-
-
-
-#ifndef APSETTINGS_LOOKUPS_H
-#define APSETTINGS_LOOKUPS_H
-
-// INCLUDE FILES
-#include <ApAccessPointItem.h>
-#include <apsetui.rsg>
-
-#include <ApSettingsHandlerCommons.h>
-
-
-// CONSTANTS
-const TInt KListIndexConnectionName = 0;
-const TInt KListIndexBearerType = 1;
-const TInt KListIndexCSDAccessNumber = 2;
-
-const TInt KListIndexWLANNetworkName = 2;
-
-const TInt KListIndexWLANSubnetMask = 1;
-const TInt KListIndexWLANDefaultGateway = 2;
-const TInt KListIndexWLANSecuritySettings = 6;
-
-
-
-const TInt KApMember = 0;
-const TInt KResourceID = 1;
-const TInt KCompulsory = 2;
-
-
-
-
-
-
-
-const TInt Fields_CSD_L2_IPv4[3][2] =
-    {
-        {
-        EApIspIPAddr,                       ///< Phone IP addr.
-        EApIP6DNSAddrFromServer             ///< Domain name servers
-        },
-        {
-        R_APUI_VIEW_PHONE_IP_ADDR,          ///< Phone IP addr.
-        R_APUI_VIEW_SET_DNS_SERVERS_IP      ///< Domain name servers
-        },
-        {
-        0,                                  ///< Phone IP addr.
-        0                                   ///< Domain name servers
-        }
-    };
-
-
-const TInt Fields_CSD_L2_IPv6[3][1] =
-    {
-        {
-        EApIP6DNSAddrFromServer             ///< Domain name servers
-        },
-        {
-        R_APUI_VIEW_SET_DNS_SERVERS_IP      ///< Domain name servers
-        },
-        {
-        0                                   ///< Domain name servers
-        }
-    };
-
-
-
-//----------------------------------------------------------
-// Settings with the KWSPSettingsVisible flag defined
-//----------------------------------------------------------
-//
-const TInt Fields_GPRS_WSP[3][8] =
-    {
-        {
-        EApWapAccessPointName,      ///< Connection name
-        EApWapCurrentBearer,        ///< Bearer type
-
-        EApGprsAccessPointName,     ///< Access Point Name
-        EApIspIfAuthName,           // username
-        EApIspPromptForLogin,       ///< prompt password
-        EApIspIfAuthPass,           // password
-        EApGprsDisablePlainTextAuth,///< password authentication
-        EApWapStartPage             ///< Starting Page
-        },
-        {
-        R_APUI_VIEW_CONNECTION_NAME,        ///< Connection name
-        R_APUI_VIEW_BEARER_TYPE,            ///< Bearer type
-        R_APUI_VIEW_AP_NAME,                ///< Access Point Name
-        R_APUI_VIEW_USER_NAME,              ///< username
-        R_APUI_VIEW_PROMPT_PASSWORD,        ///< prompt password
-        R_APUI_VIEW_PASSWORD,               ///< password
-        R_APUI_VIEW_PASSWORD_AUTH,          ///< password authentication
-        R_APUI_VIEW_STARTING_PAGE           ///< Starting Page
-        },
-        {
-        1,                                  ///< Connection name
-        0,                                  ///< Bearer type
-        0,                                  ///< Access Point Name
-        0,                                  ///< username
-        0,                                  ///< prompt password
-        0,                                  ///< password
-        0,                                  ///< password authentication
-        0                                   ///< Starting Page
-        }
-    };
-
-
-
-const TInt Fields_GPRS_Advanced_WSP[3][8] =
-    {
-        {
-        EApIspIPAddr,               ///< Phone IP addr.
-        EApGprsIPNameServer1,       ///< Primary Name server
-        EApGprsIPNameServer2,       ///< Secondary Name server
-        EApProxyServerAddress,      ///< Proxy server address
-        EApProxyPortNumber,         ///< Proxy port number
-        EApWapGatewayAddress,       ///< Wap Gateway IP address
-        EApWapSecurity,             ///< WTLS Security
-        EApWapWspOption             ///< Connection type
-        },
-        {
-        R_APUI_VIEW_PHONE_IP_ADDR,          ///< Phone IP addr.
-        R_APUI_VIEW_PRIMARY_NAME_SERVER,    ///< Primary Name server
-        R_APUI_VIEW_SECONDARY_NAME_SERVER,  ///< Secondary Name server
-        R_APUI_VIEW_PROXY_SERVER_ADDR,      ///< Proxy server address
-        R_APUI_VIEW_PROXY_PORT_NUMBER,      ///< Proxy port number
-        R_APUI_VIEW_WAP_GW_IP_ADDR,         ///< Wap Gateway IP address
-        R_APUI_VIEW_WTLS_SECURITY,          ///< WTLS Security
-        R_APUI_VIEW_CONNECTION_TYPE         ///< Connection type
-        },
-        {
-        0,                                  ///< Phone IP addr.
-        0,                                  ///< Primary Name server
-        0,                                  ///< Secondary Name server
-        0,                                  ///< Proxy server address
-        0,                                  ///< Proxy port number
-        0,                                  ///< Wap Gateway IP address
-        0,                                  ///< WTLS Security
-        0                                   ///< Connection type
-        }
-    };
-
-
-
-const TInt Fields_CSD_WSP[3][10] =
-    {
-        {
-        EApWapAccessPointName,          ///< Connection name
-        EApWapCurrentBearer,            ///< Bearer type
-
-        EApIspDefaultTelNumber,         ///< Access Number
-        EApIspIfAuthName,               // username
-        EApIspPromptForLogin,           ///< prompt password
-        EApIspIfAuthPass,               // password
-        EApGprsDisablePlainTextAuth,    ///< password authentication
-        EApWapStartPage,                ///< Starting Page
-        EApIspBearerCallTypeIsdn,       ///< Data call type 
-                                        ///< (analogue/ISDN110/ISDN120)
-        EApIspBearerSpeed               ///< Max. connection speed
-        },
-        {
-        R_APUI_VIEW_CONNECTION_NAME,        ///< Connection name
-        R_APUI_VIEW_BEARER_TYPE,            ///< Bearer type
-        R_APUI_VIEW_ACCESS_NUMBER,          ///< Access Number
-        R_APUI_VIEW_USER_NAME,              ///< username
-        R_APUI_VIEW_PROMPT_PASSWORD,        ///< prompt password
-        R_APUI_VIEW_PASSWORD,               ///< password
-        R_APUI_VIEW_PASSWORD_AUTH,          ///< password authentication
-        R_APUI_VIEW_STARTING_PAGE,          ///< Starting Page
-        R_APUI_VIEW_DATA_CALL_TYPE,         ///< Data call type (analogue/ISDN)
-        R_APUI_VIEW_MAX_CONN_SPEED          ///< Max. connection speed
-        },
-        {
-        1,                                  ///< Connection name
-        0,                                  ///< Bearer type
-        1,                                  ///< Access Number
-        0,                                  ///< username
-        0,                                  ///< prompt password
-        0,                                  ///< password
-        0,                                  ///< password authentication
-        0,                                  ///< Starting Page
-        0,                                  ///< Data call type (analogue/ISDN)
-        0                                   ///< Max. connection speed
-        }
-    };
-
-
-const TInt Fields_CSD_Advanced_WSP[3][15] =
-    {
-        {
-        EApIspIPAddr,               ///< Phone IP addr.
-        EApGprsIPNameServer1,       ///< Primary Name server
-        EApGprsIPNameServer2,       ///< Secondary Name server
-        EApProxyServerAddress,      ///< Proxy server address
-        EApProxyPortNumber,         ///< Proxy port number
-        EApIspIfCallbackEnabled,    ///< use callback
-        EApIspIfCallbackType,       ///< call back type
-        EApIspIfCallbackInfo,       ///< call back number
-        EApIspEnableSWCompression,  ///< Enable SW compression
-        EApIspUseLoginScript,       ///< Use login script
-        EApIspLoginScript,          ///< The login script
-        EApIspInitString,           ///< Modem init string
-        EApWapGatewayAddress,           ///< Wap Gateway IP address
-        EApWapSecurity,                 ///< WTLS Security
-        EApWapWspOption                 ///< Connection type
-        },
-        {
-        R_APUI_VIEW_PHONE_IP_ADDR,          ///< Phone IP addr.
-        R_APUI_VIEW_PRIMARY_NAME_SERVER,    ///< Primary Name server
-        R_APUI_VIEW_SECONDARY_NAME_SERVER,  ///< Secondary Name server
-        R_APUI_VIEW_PROXY_SERVER_ADDR,      ///< Proxy server address
-        R_APUI_VIEW_PROXY_PORT_NUMBER,      ///< Proxy port number
-        R_APUI_VIEW_USE_CALL_BACK,          ///< use callback
-        R_APUI_VIEW_CALL_BACK_TYPE,         ///< call back type
-        R_APUI_VIEW_CALL_BACK_NUMBER,       ///< call back number
-        R_APUI_VIEW_ENABLE_PPP_COMP,        ///< Enable PPP compression
-        R_APUI_VIEW_USE_LOGIN_SCRIPT,       ///< Use login script
-        R_APUI_VIEW_LOGIN_SCRIPT,           ///< The login script
-        R_APUI_VIEW_MODEM_INIT_STRING,      ///< Modem init string
-        R_APUI_VIEW_WAP_GW_IP_ADDR,         ///< Wap Gateway IP address
-        R_APUI_VIEW_WTLS_SECURITY,          ///< WTLS Security
-        R_APUI_VIEW_CONNECTION_TYPE         ///< Connection type
-        },
-        {
-        0,                                  ///< Phone IP addr.
-        0,                                  ///< Primary Name server
-        0,                                  ///< Secondary Name server
-        0,                                  ///< Proxy server address
-        0,                                  ///< Proxy port number
-        0,                                  ///< use callback
-        0,                                  ///< call back type
-        0,                                  ///< call back number
-        0,                                  ///< Enable PPP compression
-        0,                                  ///< Use login script
-        0,                                  ///< The login script
-        0,                                  ///< Modem init string
-        0,                                  ///< Wap Gateway IP address
-        0,                                  ///< WTLS Security
-        0                                   ///< Connection type
-        }
-    };
-
-
-
-
-
-
-//----------------------------------------------------------
-// Normal settings, no flags defined
-//----------------------------------------------------------
-//
-const TInt Fields_GPRS[3][8] =
-    {
-        {
-        EApWapAccessPointName,      ///< Connection name
-        EApWapCurrentBearer,        ///< Bearer type
-
-        EApGprsAccessPointName,     ///< Access Point Name
-        EApIspIfAuthName,           // username
-        EApIspPromptForLogin,       ///< prompt password
-        EApIspIfAuthPass,           // password
-        EApGprsDisablePlainTextAuth,///< password authentication
-        EApWapStartPage             ///< Starting Page
-        },
-        {
-        R_APUI_VIEW_CONNECTION_NAME,        ///< Connection name
-        R_APUI_VIEW_BEARER_TYPE,            ///< Bearer type
-        R_APUI_VIEW_AP_NAME,                ///< Access Point Name
-        R_APUI_VIEW_USER_NAME,              ///< username
-        R_APUI_VIEW_PROMPT_PASSWORD,        ///< prompt password
-        R_APUI_VIEW_PASSWORD,               ///< password
-        R_APUI_VIEW_PASSWORD_AUTH,          ///< password authentication
-        R_APUI_VIEW_STARTING_PAGE           ///< Starting Page
-        },
-        {
-        1,                                  ///< Connection name
-        0,                                  ///< Bearer type
-        0,                                  ///< Access Point Name
-        0,                                  ///< username
-        0,                                  ///< prompt password
-        0,                                  ///< password
-        0,                                  ///< password authentication
-        0                                   ///< Starting Page
-        }
-    };
-
-
-
-const TInt Fields_GPRS_Advanced[3][5] =
-    {
-        {
-        EApIspIPAddr,               ///< Phone IP addr.
-        EApGprsIPNameServer1,       ///< Primary Name server
-        EApGprsIPNameServer2,       ///< Secondary Name server
-        EApProxyServerAddress,      ///< Proxy server address
-        EApProxyPortNumber          ///< Proxy port number
-        },
-        {
-        R_APUI_VIEW_PHONE_IP_ADDR,          ///< Phone IP addr.
-        R_APUI_VIEW_PRIMARY_NAME_SERVER,    ///< Primary Name server
-        R_APUI_VIEW_SECONDARY_NAME_SERVER,  ///< Secondary Name server
-        R_APUI_VIEW_PROXY_SERVER_ADDR,      ///< Proxy server address
-        R_APUI_VIEW_PROXY_PORT_NUMBER       ///< Proxy port number
-        },
-        {
-        0,                                  ///< Phone IP addr.
-        0,                                  ///< Primary Name server
-        0,                                  ///< Secondary Name server
-        0,                                  ///< Proxy server address
-        0                                   ///< Proxy port number
-        }
-    };
-
-
-
-const TInt Fields_CSD[3][10] =
-    {
-        {
-        EApWapAccessPointName,          ///< Connection name
-        EApWapCurrentBearer,            ///< Bearer type
-
-        EApIspDefaultTelNumber,         ///< Access Number
-        EApIspIfAuthName,               // username
-        EApIspPromptForLogin,           ///< prompt password
-        EApIspIfAuthPass,               // password
-        EApGprsDisablePlainTextAuth,    ///< password authentication
-        EApWapStartPage,                ///< Starting Page
-        EApIspBearerCallTypeIsdn,       ///< Data call type 
-                                        ///< (analogue/ISDN110/ISDN120)
-        EApIspBearerSpeed               ///< Max. connection speed
-        },
-        {
-        R_APUI_VIEW_CONNECTION_NAME,        ///< Connection name
-        R_APUI_VIEW_BEARER_TYPE,            ///< Bearer type
-        R_APUI_VIEW_ACCESS_NUMBER,          ///< Access Number
-        R_APUI_VIEW_USER_NAME,              ///< username
-        R_APUI_VIEW_PROMPT_PASSWORD,        ///< prompt password
-        R_APUI_VIEW_PASSWORD,               ///< password
-        R_APUI_VIEW_PASSWORD_AUTH,          ///< password authentication
-        R_APUI_VIEW_STARTING_PAGE,          ///< Starting Page
-        R_APUI_VIEW_DATA_CALL_TYPE,         ///< Data call type 
-                                            ///< (analogue/ISDN)
-        R_APUI_VIEW_MAX_CONN_SPEED          ///< Max. connection speed
-        },
-        {
-        1,                                  ///< Connection name
-        0,                                  ///< Bearer type
-        1,                                  ///< Access Number
-        0,                                  ///< username
-        0,                                  ///< prompt password
-        0,                                  ///< password
-        0,                                  ///< password authentication
-        0,                                  ///< Starting Page
-        0,                                  ///< Data call type (analogue/ISDN)
-        0                                   ///< Max. connection speed
-        }
-    };
-
-
-
-const TInt Fields_CSD_Advanced[3][12] =
-    {
-        {
-        EApIspIPAddr,               ///< Phone IP addr.
-        EApGprsIPNameServer1,       ///< Primary Name server
-        EApGprsIPNameServer2,       ///< Secondary Name server
-        EApProxyServerAddress,      ///< Proxy server address
-        EApProxyPortNumber,         ///< Proxy port number
-        EApIspIfCallbackEnabled,    ///< use callback
-        EApIspIfCallbackType,       ///< call back type
-        EApIspIfCallbackInfo,       ///< call back number
-        EApIspEnableSWCompression,  ///< Enable SW compression
-        EApIspUseLoginScript,       ///< Use login script
-        EApIspLoginScript,          ///< The login script
-        EApIspInitString            ///< Modem init string
-        },
-        {
-        R_APUI_VIEW_PHONE_IP_ADDR,          ///< Phone IP addr.
-        R_APUI_VIEW_PRIMARY_NAME_SERVER,    ///< Primary Name server
-        R_APUI_VIEW_SECONDARY_NAME_SERVER,  ///< Secondary Name server
-        R_APUI_VIEW_PROXY_SERVER_ADDR,      ///< Proxy server address
-        R_APUI_VIEW_PROXY_PORT_NUMBER,      ///< Proxy port number
-        R_APUI_VIEW_USE_CALL_BACK,          ///< use callback
-        R_APUI_VIEW_CALL_BACK_TYPE,         ///< call back type
-        R_APUI_VIEW_CALL_BACK_NUMBER,       ///< call back number
-        R_APUI_VIEW_ENABLE_PPP_COMP,        ///< Enable PPP compression
-        R_APUI_VIEW_USE_LOGIN_SCRIPT,       ///< Use login script
-        R_APUI_VIEW_LOGIN_SCRIPT,           ///< The login script
-        R_APUI_VIEW_MODEM_INIT_STRING       ///< Modem init string
-        },
-        {
-        0,                                  ///< Phone IP addr.
-        0,                                  ///< Primary Name server
-        0,                                  ///< Secondary Name server
-        0,                                  ///< Proxy server address
-        0,                                  ///< Proxy port number
-        0,                                  ///< use callback
-        0,                                  ///< call back type
-        0,                                  ///< call back number
-        0,                                  ///< Enable PPP compression
-        0,                                  ///< Use login script
-        0,                                  ///< The login script
-        0                                   ///< Modem init string
-        }
-    };
-
-
-
-
-
-
-
-
-
-
-
-
-//----------------------------------------------------------
-// Settings with the KWSPSettingsVisible flag defined
-// AND IPv6 Support enabled
-//----------------------------------------------------------
-//
-const TInt Fields_GPRS_WSP_IPv6[3][8] =
-    {
-        {
-        EApWapAccessPointName,      ///< Connection name
-        EApWapCurrentBearer,        ///< Bearer type
-
-        EApGprsAccessPointName,     ///< Access Point Name
-        EApIspIfAuthName,           // username
-        EApIspPromptForLogin,       ///< prompt password
-        EApIspIfAuthPass,           // password
-        EApGprsDisablePlainTextAuth,///< password authentication
-        EApWapStartPage             ///< Starting Page
-        },
-        {
-        R_APUI_VIEW_CONNECTION_NAME,        ///< Connection name
-        R_APUI_VIEW_BEARER_TYPE,            ///< Bearer type
-        R_APUI_VIEW_AP_NAME,                ///< Access Point Name
-        R_APUI_VIEW_USER_NAME,              ///< username
-        R_APUI_VIEW_PROMPT_PASSWORD,        ///< prompt password
-        R_APUI_VIEW_PASSWORD,               ///< password
-        R_APUI_VIEW_PASSWORD_AUTH,          ///< password authentication
-        R_APUI_VIEW_STARTING_PAGE           ///< Starting Page
-        },
-        {
-        1,                                  ///< Connection name
-        0,                                  ///< Bearer type
-        0,                                  ///< Access Point Name
-        0,                                  ///< username
-        0,                                  ///< prompt password
-        0,                                  ///< password
-        0,                                  ///< password authentication
-        0                                   ///< Starting Page
-        }
-    };
-
-
-
-const TInt Fields_GPRS_Advanced_WSP_IPv6[3][8] =
-    {
-        {
-        EApGprsPdpType,             ///< PDP type, IPv4 or IPv6
-        EApIspIPAddr,               ///< Phone IP addr.
-        EApIP6DNSAddrFromServer,    ///< Domain name servers
-        EApProxyServerAddress,      ///< Proxy server address
-        EApProxyPortNumber,         ///< Proxy port number
-        EApWapGatewayAddress,       ///< Wap Gateway IP address
-        EApWapSecurity,             ///< WTLS Security
-        EApWapWspOption             ///< Connection type
-        },
-        {
-        R_APUI_VIEW_PDP_TYPE,               ///< PDP type, IPv4 or IPv6
-        R_APUI_VIEW_PHONE_IP_ADDR,          ///< Phone IP addr.
-        R_APUI_VIEW_SET_DNS_SERVERS_IP,     ///< Domain name servers
-        R_APUI_VIEW_PROXY_SERVER_ADDR,      ///< Proxy server address
-        R_APUI_VIEW_PROXY_PORT_NUMBER,      ///< Proxy port number
-        R_APUI_VIEW_WAP_GW_IP_ADDR,         ///< Wap Gateway IP address
-        R_APUI_VIEW_WTLS_SECURITY,          ///< WTLS Security
-        R_APUI_VIEW_CONNECTION_TYPE         ///< Connection type
-        },
-        {
-        0,                                  ///< PDP type, IPv4 or IPv6
-        0,                                  ///< Phone IP addr.
-        0,                                  ///< Domain name servers
-        0,                                  ///< Proxy server address
-        0,                                  ///< Proxy port number
-        0,                                  ///< Wap Gateway IP address
-        0,                                  ///< WTLS Security
-        0                                   ///< Connection type
-        }
-    };
-
-
-
-
-const TInt Fields_CSD_WSP_IPv6[3][10] =
-    {
-        {
-        EApWapAccessPointName,          ///< Connection name
-        EApWapCurrentBearer,            ///< Bearer type
-
-        EApIspDefaultTelNumber,         ///< Access Number
-        EApIspIfAuthName,               // username
-        EApIspPromptForLogin,           ///< prompt password
-        EApIspIfAuthPass,               // password
-        EApGprsDisablePlainTextAuth,    ///< password authentication
-        EApWapStartPage,                ///< Starting Page
-        EApIspBearerCallTypeIsdn,       ///< Data call type 
-                                        ///< (analogue/ISDN110/ISDN120)
-        EApIspBearerSpeed               ///< Max. connection speed
-        },
-        {
-        R_APUI_VIEW_CONNECTION_NAME,        ///< Connection name
-        R_APUI_VIEW_BEARER_TYPE,            ///< Bearer type
-        R_APUI_VIEW_ACCESS_NUMBER,          ///< Access Number
-        R_APUI_VIEW_USER_NAME,              ///< username
-        R_APUI_VIEW_PROMPT_PASSWORD,        ///< prompt password
-        R_APUI_VIEW_PASSWORD,               ///< password
-        R_APUI_VIEW_PASSWORD_AUTH,          ///< password authentication
-        R_APUI_VIEW_STARTING_PAGE,          ///< Starting Page
-        R_APUI_VIEW_DATA_CALL_TYPE,         ///< Data call type (analogue/ISDN)
-        R_APUI_VIEW_MAX_CONN_SPEED          ///< Max. connection speed
-        },
-        {
-        1,                                  ///< Connection name
-        0,                                  ///< Bearer type
-        1,                                  ///< Access Number
-        0,                                  ///< username
-        0,                                  ///< prompt password
-        0,                                  ///< password
-        0,                                  ///< password authentication
-        0,                                  ///< Starting Page
-        0,                                  ///< Data call type (analogue/ISDN)
-        0                                   ///< Max. connection speed
-        }
-    };
-
-
-const TInt Fields_CSD_Advanced_WSP_IPv6[3][14] =
-    {
-        {
-        EApIpv4Settings,                ///< Ipv4 Settings
-        EApIpv6Settings,                ///< Ipv6 Settings
-        EApProxyServerAddress,          ///< Proxy server address
-        EApProxyPortNumber,             ///< Proxy port number
-        EApIspIfCallbackEnabled,        ///< use callback
-        EApIspIfCallbackType,           ///< call back type
-        EApIspIfCallbackInfo,           ///< call back number
-        EApIspEnableSWCompression,      ///< Enable SW compression
-        EApIspUseLoginScript,           ///< Use login script
-        EApIspLoginScript,              ///< The login script
-        EApIspInitString,               ///< Modem init string
-        EApWapGatewayAddress,           ///< Wap Gateway IP address
-        EApWapSecurity,                 ///< WTLS Security
-        EApWapWspOption                 ///< Connection type
-        },
-        {
-        R_APUI_VIEW_IPV4_SETTINGS,          ///< Ipv4 Settings
-        R_APUI_VIEW_IPV6_SETTINGS,          ///< Ipv6 Settings
-        R_APUI_VIEW_PROXY_SERVER_ADDR,      ///< Proxy server address
-        R_APUI_VIEW_PROXY_PORT_NUMBER,      ///< Proxy port number
-        R_APUI_VIEW_USE_CALL_BACK,          ///< use callback
-        R_APUI_VIEW_CALL_BACK_TYPE,         ///< call back type
-        R_APUI_VIEW_CALL_BACK_NUMBER,       ///< call back number
-        R_APUI_VIEW_ENABLE_PPP_COMP,        ///< Enable PPP compression
-        R_APUI_VIEW_USE_LOGIN_SCRIPT,       ///< Use login script
-        R_APUI_VIEW_LOGIN_SCRIPT,           ///< The login script
-        R_APUI_VIEW_MODEM_INIT_STRING,      ///< Modem init string
-        R_APUI_VIEW_WAP_GW_IP_ADDR,         ///< Wap Gateway IP address
-        R_APUI_VIEW_WTLS_SECURITY,          ///< WTLS Security
-        R_APUI_VIEW_CONNECTION_TYPE         ///< Connection type
-        },
-        {
-        0,                                  ///< Ipv4 Settings
-        0,                                  ///< Ipv6 Settings
-        0,                                  ///< Proxy server address
-        0,                                  ///< Proxy port number
-        0,                                  ///< use callback
-        0,                                  ///< call back type
-        0,                                  ///< call back number
-        0,                                  ///< Enable PPP compression
-        0,                                  ///< Use login script
-        0,                                  ///< The login script
-        0,                                  ///< Modem init string
-        0,                                  ///< Wap Gateway IP address
-        0,                                  ///< WTLS Security
-        0                                   ///< Connection type
-        }
-    };
-
-
-
-
-
-
-
-
-
-//----------------------------------------------------------
-// Normal settings, only Ipv6 defined
-//----------------------------------------------------------
-//
-const TInt Fields_GPRS_IPv6[3][8] =
-    {
-        {
-        EApWapAccessPointName,      ///< Connection name
-        EApWapCurrentBearer,        ///< Bearer type
-
-        EApGprsAccessPointName,     ///< Access Point Name
-        EApIspIfAuthName,           // username
-        EApIspPromptForLogin,       ///< prompt password
-        EApIspIfAuthPass,           // password
-        EApGprsDisablePlainTextAuth,///< password authentication
-        EApWapStartPage             ///< Starting Page
-        },
-        {
-        R_APUI_VIEW_CONNECTION_NAME,        ///< Connection name
-        R_APUI_VIEW_BEARER_TYPE,            ///< Bearer type
-        R_APUI_VIEW_AP_NAME,                ///< Access Point Name
-        R_APUI_VIEW_USER_NAME,              ///< username
-        R_APUI_VIEW_PROMPT_PASSWORD,        ///< prompt password
-        R_APUI_VIEW_PASSWORD,               ///< password
-        R_APUI_VIEW_PASSWORD_AUTH,          ///< password authentication
-        R_APUI_VIEW_STARTING_PAGE           ///< Starting Page
-        },
-        {
-        1,                                  ///< Connection name
-        0,                                  ///< Bearer type
-        0,                                  ///< Access Point Name
-        0,                                  ///< username
-        0,                                  ///< prompt password
-        0,                                  ///< password
-        0,                                  ///< password authentication
-        0                                   ///< Starting Page
-        }
-    };
-
-
-
-const TInt Fields_GPRS_Advanced_IPv6[3][5] =
-    {
-        {
-        EApGprsPdpType,                     ///< PDP type, IPv4 or IPv6
-        EApIspIPAddr,                       ///< Phone IP addr.
-        EApIP6DNSAddrFromServer,            ///< Domain name servers
-        EApProxyServerAddress,              ///< Proxy server address
-        EApProxyPortNumber                  ///< Proxy port number
-        },
-        {
-        R_APUI_VIEW_PDP_TYPE,               ///< PDP type, IPv4 or IPv6
-        R_APUI_VIEW_PHONE_IP_ADDR,          ///< Phone IP addr.
-        R_APUI_VIEW_SET_DNS_SERVERS_IP,     ///< Domain name servers        
-        R_APUI_VIEW_PROXY_SERVER_ADDR,      ///< Proxy server address
-        R_APUI_VIEW_PROXY_PORT_NUMBER       ///< Proxy port number
-        },
-        {
-        0,                                  ///< PDP type, IPv4 or IPv6
-        0,                                  ///< Phone IP addr.
-        0,                                  ///< Domain name servers
-        0,                                  ///< Proxy server address
-        0                                   ///< Proxy port number
-        }
-    };
-
-
-
-const TInt Fields_CSD_IPv6[3][10] =
-    {
-        {
-        EApWapAccessPointName,              ///< Connection name
-        EApWapCurrentBearer,                ///< Bearer type
-
-        EApIspDefaultTelNumber,             ///< Access Number
-        EApIspIfAuthName,                   ///< username
-        EApIspPromptForLogin,               ///< prompt password
-        EApIspIfAuthPass,                   ///< password
-        EApGprsDisablePlainTextAuth,        ///< password authentication
-        EApWapStartPage,                    ///< Starting Page
-        EApIspBearerCallTypeIsdn,           ///< Data call type 
-                                            ///< (analogue/ISDN110/ISDN120)
-        EApIspBearerSpeed                   ///< Max. connection speed
-        },
-        {
-        R_APUI_VIEW_CONNECTION_NAME,        ///< Connection name
-        R_APUI_VIEW_BEARER_TYPE,            ///< Bearer type
-        R_APUI_VIEW_ACCESS_NUMBER,          ///< Access Number
-        R_APUI_VIEW_USER_NAME,              ///< username
-        R_APUI_VIEW_PROMPT_PASSWORD,        ///< prompt password
-        R_APUI_VIEW_PASSWORD,               ///< password
-        R_APUI_VIEW_PASSWORD_AUTH,          ///< password authentication
-        R_APUI_VIEW_STARTING_PAGE,          ///< Starting Page
-        R_APUI_VIEW_DATA_CALL_TYPE,         ///< Data call type (analogue/ISDN)
-        R_APUI_VIEW_MAX_CONN_SPEED          ///< Max. connection speed
-        },
-        {
-        1,                                  ///< Connection name
-        0,                                  ///< Bearer type
-        1,                                  ///< Access Number
-        0,                                  ///< username
-        0,                                  ///< prompt password
-        0,                                  ///< password
-        0,                                  ///< password authentication
-        0,                                  ///< Starting Page
-        0,                                  ///< Data call type (analogue/ISDN)
-        0                                   ///< Max. connection speed
-        }
-    };
-
-
-
-const TInt Fields_CSD_Advanced_IPv6[3][11] =
-    {
-        {
-        EApIpv4Settings,                    ///< Ipv4 Settings
-        EApIpv6Settings,                    ///< Ipv6 Settings
-        EApProxyServerAddress,              ///< Proxy server address
-        EApProxyPortNumber,                 ///< Proxy port number
-        EApIspIfCallbackEnabled,            ///< use callback
-        EApIspIfCallbackType,               ///< call back type
-        EApIspIfCallbackInfo,               ///< call back number
-        EApIspEnableSWCompression,          ///< Enable SW compression
-        EApIspUseLoginScript,               ///< Use login script
-        EApIspLoginScript,                  ///< The login script
-        EApIspInitString                    ///< Modem init string
-        },
-        {
-        R_APUI_VIEW_IPV4_SETTINGS,          ///< Ipv4 Settings
-        R_APUI_VIEW_IPV6_SETTINGS,          ///< Ipv6 Settings
-        R_APUI_VIEW_PROXY_SERVER_ADDR,      ///< Proxy server address
-        R_APUI_VIEW_PROXY_PORT_NUMBER,      ///< Proxy port number
-        R_APUI_VIEW_USE_CALL_BACK,          ///< use callback
-        R_APUI_VIEW_CALL_BACK_TYPE,         ///< call back type
-        R_APUI_VIEW_CALL_BACK_NUMBER,       ///< call back number
-        R_APUI_VIEW_ENABLE_PPP_COMP,        ///< Enable PPP compression
-        R_APUI_VIEW_USE_LOGIN_SCRIPT,       ///< Use login script
-        R_APUI_VIEW_LOGIN_SCRIPT,           ///< The login script
-        R_APUI_VIEW_MODEM_INIT_STRING       ///< Modem init string
-        },
-        {
-        0,                                  ///< Ipv4 Settings
-        0,                                  ///< Ipv6 Settings
-        0,                                  ///< Proxy server address
-        0,                                  ///< Proxy port number
-        0,                                  ///< use callback
-        0,                                  ///< call back type
-        0,                                  ///< call back number
-        0,                                  ///< Enable PPP compression
-        0,                                  ///< Use login script
-        0,                                  ///< The login script
-        0                                   ///< Modem init string
-        }
-    };
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-const TInt Fields_WLAN_IPv6[3][8] =
-    {
-        {
-        EApWapAccessPointName,              ///< Connection name
-        EApWapCurrentBearer,                ///< Bearer type
-        EApWlanNetworkName,                 ///< The network name
-        EApWlanScanSSID,                    ///< need to scan the SSID?
-        EApWlanNetworkMode,                 ///< Gives network mode
-        EApWlanSecurityMode,                ///< The security mode
-        EApWlanSecuritySettings,            ///< The security settings menu
-        EApWapStartPage                     ///< Starting Page
-        },
-        {
-        R_APUI_VIEW_CONNECTION_NAME,        ///< Connection name
-        R_APUI_VIEW_BEARER_TYPE,            ///< Bearer type
-        R_APUI_VIEW_WLAN_NETWORK_NAME,      ///< The network name
-        R_APUI_VIEW_WLAN_HIDDEN_NETWORK,    ///< need to scan the SSID?
-        R_APUI_VIEW_WLAN_NETWORK_MODE,      ///< The network mode
-        R_APUI_VIEW_WLAN_SECURITY_MODE,     ///< The security mode
-        R_APUI_VIEW_WLAN_SECURITY_SETTINGS, ///< The security settings menu
-        R_APUI_VIEW_STARTING_PAGE           ///< Starting Page
-        },
-        {
-        1,                                  ///< Connection name
-        0,                                  ///< Bearer type
-        1,                                  ///< The network name
-        0,                                  ///< need to scan the SSID
-        0,                                  ///< Gives network mode
-        0,                                  ///< The security mode
-        0,                                  ///< The security settings menu
-        0                                   ///< Starting Page
-        }
-    };
-
-
-
-const TInt Fields_WLAN_Advanced_IPv6[3][5] =
-    {
-        {
-        EApIpv4Settings,                    ///< Ipv4 Settings
-        EApIpv6Settings,                    ///< Ipv6 Settings
-        EApWlanChannelId,                   ///< Ad-hoc channel auto/userdef.
-        EApProxyServerAddress,              ///< Proxy server address
-        EApProxyPortNumber                  ///< Proxy port number
-        },
-        {
-        R_APUI_VIEW_IPV4_SETTINGS,          ///< Ipv4 Settings
-        R_APUI_VIEW_IPV6_SETTINGS,          ///< Ipv6 Settings
-        R_APUI_VIEW_AD_HOC,                  ///< Ad-hoc channel auto/userdef.
-        R_APUI_VIEW_PROXY_SERVER_ADDR,      ///< Proxy server address
-        R_APUI_VIEW_PROXY_PORT_NUMBER       ///< Proxy port number
-        },
-        {
-        0,                                  ///< Ipv4 Settings
-        0,                                  ///< Ipv6 Settings
-        0,                                  ///< Ad-hoc channel auto/userdef.
-        0,                                  ///< Proxy server address
-        0                                   ///< Proxy port number
-        }
-    };
-
-
-
-
-const TInt Fields_WLAN_IPv4[3][8] =
-    {
-        {
-        EApWapAccessPointName,              ///< Connection name
-        EApWapCurrentBearer,                ///< Bearer type
-        EApWlanNetworkName,                 ///< The network name
-        EApWlanScanSSID,                    ///< need to scan the SSID?        
-        EApWlanNetworkMode,                 ///< Gives network mode
-        EApWlanSecurityMode,                ///< The security mode
-        EApWlanSecuritySettings,            ///< The security settings menu
-        EApWapStartPage                     ///< Starting Page
-        },
-        {
-        R_APUI_VIEW_CONNECTION_NAME,        ///< Connection name
-        R_APUI_VIEW_BEARER_TYPE,            ///< Bearer type
-        R_APUI_VIEW_WLAN_NETWORK_NAME,      ///< The network name
-        R_APUI_VIEW_WLAN_HIDDEN_NETWORK,    ///< need to scan the SSID?        
-        R_APUI_VIEW_WLAN_NETWORK_MODE,      ///< The network mode
-        R_APUI_VIEW_WLAN_SECURITY_MODE,     ///< The security mode
-        R_APUI_VIEW_WLAN_SECURITY_SETTINGS, ///< The security settings menu
-        R_APUI_VIEW_STARTING_PAGE           ///< Starting Page
-        },
-        {
-        1,                                  ///< Connection name
-        0,                                  ///< Bearer type
-        1,                                  ///< The network name
-        0,                                  ///< need to scan the SSID
-        0,                                  ///< Gives network mode
-        0,                                  ///< The security mode
-        0,                                  ///< The security settings menu
-        0                                   ///< Starting Page
-        }
-    };
-
-
-const TInt Fields_WLAN_Advanced_IPv4[3][8] =
-    {
-        {
-        EApIspIPAddr,               ///< Phone IP addr.
-        EApIspIPNetMask,            ///< Subnet mask
-        EApIspIPGateway,            ///< IP address of gateway
-        EApGprsIPNameServer1,       ///< Primary Name server
-        EApGprsIPNameServer2,       ///< Secondary Name server
-        EApWlanChannelId,           ///< Ad-hoc channel auto/userdef.
-        EApProxyServerAddress,      ///< Proxy server address
-        EApProxyPortNumber          ///< Proxy port number
-        },
-        {
-        R_APUI_VIEW_PHONE_IP_ADDR,          ///< Phone IP addr.
-        R_APUI_NETMASK,                     ///< Subnet mask
-        R_APUI_IP_GATEWAY,                  ///< IP address of gateway        
-        R_APUI_VIEW_PRIMARY_NAME_SERVER,    ///< Primary Name server
-        R_APUI_VIEW_SECONDARY_NAME_SERVER,  ///< Secondary Name server
-        R_APUI_VIEW_AD_HOC,                  ///< Ad-hoc channel auto/userdef.
-        R_APUI_VIEW_PROXY_SERVER_ADDR,      ///< Proxy server address
-        R_APUI_VIEW_PROXY_PORT_NUMBER       ///< Proxy port number
-        },
-        {
-        0,                                  ///< Phone IP addr.
-        1,                                  ///< Subnet mask
-        1,                                  ///< IP address of gateway
-        0,                                  ///< Primary Name server
-        0,                                  ///< Secondary Name server
-        0,                                  ///< Ad-hoc channel auto/userdef.
-        0,                                  ///< Proxy server address
-        0                                   ///< Proxy port number
-        }
-    };
-    
-    
-    
-const TInt Fields_WLAN_L2_IPv4[3][4] =
-    {
-        {
-        EApIspIPAddr,                       ///< Phone IP addr.
-        EApIspIPNetMask,                    ///< Subnet mask
-        EApIspIPGateway,                    ///< IP address of gateway        
-        EApIP6DNSAddrFromServer             ///< Domain name servers
-        },
-        {
-        R_APUI_VIEW_PHONE_IP_ADDR,          ///< Phone IP addr.
-        R_APUI_NETMASK,                     ///< Subnet mask
-        R_APUI_IP_GATEWAY,                  ///< IP address of gateway
-        R_APUI_VIEW_SET_DNS_SERVERS_IP      ///< Domain name servers
-        },
-        {
-        0,                                  ///< Phone IP addr.
-        1,                                  ///< Subnet mask
-        1,                                  ///< IP address of gateway
-        0                                   ///< Domain name servers
-        }
-    };
-
-
-#endif
-
-// End of File
--- a/apengine/apsettingshandlerui/inc/ApSettingsModel.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,699 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of class CApSettingsModel.
-*
-*/
-
-
-#ifndef APSETTINGS_MODEL_H
-#define APSETTINGS_MODEL_H
-
-// INCLUDE FILES
-#include <ApDataHandler.h>
-#include <ApUtils.h>
-#include <ApSelect.h>
-
-#include <ApSettingsHandlerCommons.h>
-
-#include <ApProtHandler.h> //for protection of settings
-
-
-// FORWARD DECLARATION
-class CActiveApDb;
-class CApListItem;
-class CApListItemList;
-class CApAccessPointItem;
-class CApDataHandler;
-class CApSelect;
-class CAknWaitDialog;
-class CApSettingsDeleteOperation;
-class CApNetworkItemList;
-class CFeatureManagerWrapper;
-class CVpnApEngine;
-class CEikonEnv;
-
-class CWEPSecuritySettings;
-
-class CWPASecuritySettings;
-
-
-
-/**
-* A structure to hold filtering parameters
-* First, it is possible to specify which ISP-type we are looking for. 
-* The possible values are:
-* <br>
-* KEApIspTypeInternetOnly:  Filter allows only access points that are 
-*                           capable of only internet access.
-* <br>
-* KEApIspTypeWAPOnly:       Filter allows only access points that are 
-*                           capable of only WAP access.
-* <br>
-* KEApIspTypeInternetAndWAP:Filter allows only access points that are 
-*                           capable of internet AND WAP access.
-* <br>
-* KEApIspTypeWAPMandatory:  Filter allows only access points that are 
-*                           capable of WAP access AND contain mandatory
-*                           WAP settings.
-* <br>
-* KEApIspTypeAll:           No filtering is done for the isp-type, 
-*                           all types of access points are shown.
-* <br>
-* It is possible to combine them by simply adding/or-ing together the values,
-* filtering will be done in such a way that only access points with the 
-* listed ISP-types will be shown.
-* Second filtering possibility (aBearerFilter) is the desired bearer type.
-* The possible values are the values of the TApBearerType enum type and their 
-* combinations, as in case of the ISP type.
-* The ordering of the list can be specified with the aSortType parameter. 
-* It can have the following values:
-* KEApSortUidAscending:     The sorting is done according to the ID 
-*                           of the access points in ascending order.
-* KEApSortUidDescending:    The sorting is done according to the ID 
-*                           of the access points in descending order.
-* KEApSortNameAscending:    The sorting is done according to the name 
-*                           of the access points in ascending order.
-* KEApSortNameDescending:   The sorting is done according to the name 
-*                           of the access points in descending order.
-*/
-typedef struct
-    {
-        TInt                iIspFilter;
-        TInt                iBearerFilter;
-        TInt                iSortType;
-    }TApSettingsParams;
-
-
-
-
-
-
-
-// CLASS DECLARATION
-
-/**
-* Model for the access point settings ui.
-*/
-NONSHARABLE_CLASS( CApSettingsModel ) : public CBase
-    {
-    public:     // Construct / destruct
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * The following three parameters specify the filtering and ordering 
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly:  Filter allows only access points that are
-        *                           capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly:       Filter allows only access points that are 
-        *                           capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP:Filter allows only access points that are
-        *                           capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory:  Filter allows only access points that are 
-        *                           capable of WAP access AND contain 
-        *                           mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll:           No filtering is done for the isp-type, all
-        *                           types of access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the 
-        * values, filtering will be done in such a way that only access points 
-        * with the listed ISP-types will be shown.
-        * Second filtering possibility (aBearerFilter) is the desired bearer 
-        * type. The possible values are the values of the TApBearerType enum 
-        * type and their combinations, as in case of the ISP type.
-        * The ordering of the list can be specified with the aSortType 
-        * parameter. It can have the following values:
-        * KEApSortUidAscending:     The sorting is done according to the ID 
-        *                           of the access points in ascending order.
-        * KEApSortUidDescending:    The sorting is done according to the ID 
-        *                           of the access points in descending order.
-        * KEApSortNameAscending:    The sorting is done according to the name 
-        *                           of the access points in ascending order.
-        * KEApSortNameDescending:   The sorting is done according to the name 
-        *                           of the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        * @param aVariant The local variant value
-        * @param aIncludeEasyWlan a TBool indicating whether to include the
-        *   EasyWlan AP in the list or not
-        * @param aNoEdit Gives wether editing is allowed or not
-        * @return The constructed listbox.
-        */
-        static CApSettingsModel* NewL(
-                                      TInt aIspFilter,
-                                      TInt aBearerFilter,
-                                      TInt aSortType,
-                                      TInt aReqIpvType,
-                                      TVpnFilterType aVpnFilterType,
-                                      TInt aVariant,
-                                      TBool aIncludeEasyWlan,
-                                      TBool aNoEdit
-                                     );
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * The following three parameters specify the filtering and ordering 
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly:  Filter allows only access points that are
-        *                           capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly:       Filter allows only access points that are 
-        *                           capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP:Filter allows only access points that are
-        *                           capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory:  Filter allows only access points that are 
-        *                           capable of WAP access AND contain 
-        *                           mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll:           No filtering is done for the isp-type, all
-        *                           types of access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the 
-        * values, filtering will be done in such a way that only access points 
-        * with the listed ISP-types will be shown.
-        * Second filtering possibility (aBearerFilter) is the desired bearer 
-        * type. The possible values are the values of the TApBearerType enum 
-        * type and their combinations, as in case of the ISP type.
-        * The ordering of the list can be specified with the aSortType 
-        * parameter. It can have the following values:
-        * KEApSortUidAscending:     The sorting is done according to the ID 
-        *                           of the access points in ascending order.
-        * KEApSortUidDescending:    The sorting is done according to the ID 
-        *                           of the access points in descending order.
-        * KEApSortNameAscending:    The sorting is done according to the name 
-        *                           of the access points in ascending order.
-        * KEApSortNameDescending:   The sorting is done according to the name 
-        *                           of the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aDb The database to work on
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        * @param aVariant The local variant value
-        * @param aIncludeEasyWlan a TBool indicating whether to include the
-        *   EasyWlan AP in the list or not
-        * @param aNoEdit Gives wether editing is allowed or not        
-        * @return The constructed listbox model.
-        */
-        static CApSettingsModel* NewL(
-                                      CActiveApDb& aDb,
-                                      TInt aIspFilter,
-                                      TInt aBearerFilter,
-                                      TInt aSortType,
-                                      TInt aReqIpvType,
-                                      TVpnFilterType aVpnFilterType,
-                                      TInt aVariant,
-                                      TBool aIncludeEasyWlan,
-                                      TBool aNoEdit
-                                     );
-
-        /**
-        * Destructor.
-        */
-        virtual ~CApSettingsModel();
-
-
-    protected:
-        /**
-        * Constructor.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @param aVariant   The variant
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        * @param aVariant The local variant value
-        * @param aIncludeEasyWlan a TBool indicating whether to include the
-        *   EasyWlan AP in the list or not
-        * @param aNoEdit Gives wether editing is allowed or not
-        */
-        CApSettingsModel(
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType,
-                        TInt aReqIpvType,
-                        TInt aVariant,
-                        TVpnFilterType aVpnFilterType,
-                        TBool aIncludeEasyWlan,
-                        TBool aNoEdit
-                        );
-
-
-        /**
-        * Second phase constructor. Leaves on failure.
-        * @param aDb Database to use if any, NULL otherwise.
-        */
-        virtual void ConstructL( CActiveApDb* aDb );
-
-
-    public:
-        /**
-        * Returns the database object
-        */
-        CActiveApDb*     Database();
-
-
-        /**
-        * Gets the APs corresponding to the filtering criteria,
-        * already ordered.
-        * @param aFailedLocked a boolean indicating if the operation
-        * had failed because the DB was locked
-        * @param aList a reference to the list of APs.
-        * The passed list will be erased, elements destroyed,
-        * new elements created in it. The list owns the created elements
-        * and the caller maintaines ownership of the list.
-        * @param aIspFilter The isp filter to be used
-        * @param aBearerFilter The bearer filter to be used
-        * @param aSortType The ordering to be used.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @return the number of items in the list.
-        */
-        TInt AllListItemDataL
-                (
-                TBool& aFailedLocked,
-                CApListItemList& aList,
-                TInt aIspFilter,
-                TInt aBearerFilter,
-                TInt aSortType,
-                TInt aReqIpvType
-                );
-
-                
-        /**
-        * Gets the APs corresponding to the filtering criteria,
-        * already ordered.
-        * @param aFailedLocked a boolean indicating if the operation
-        * had failed because the DB was locked
-        * @param aList a reference to the list of APs.
-        * The passed list will be erased, elements destroyed,
-        * new elements created in it. The list owns the created elements
-        * and the caller maintaines ownership of the list.
-        * @param aIspFilter The isp filter to be used
-        * @param aBearerFilter The bearer filter to be used
-        * @param aSortType The ordering to be used.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.        
-        * @param aVpnFilterType
-        * @param aIncludeEasyWlan a TBool indicating whether to include the
-        *   EasyWlan AP in the list or not        
-        * @return the number of items in the list.
-        */
-        TInt AllListItemDataL
-                (
-                TBool& aFailedLocked,
-                CApListItemList& aList,
-                TInt aIspFilter,
-                TInt aBearerFilter,
-                TInt aSortType,
-                TInt aReqIpvType,
-                TVpnFilterType aVpnFilterType,
-                TBool aIncludeEasyWlan
-                );
-
-
-        /**
-        * Gets the APs corresponding to the filtering criteria,
-        * already ordered.
-        * @param aFailedLocked a boolean indicating if the operation
-        * had failed because the DB was locked
-        * @param aList a reference to the list of APs.
-        * The passed list will be erased, elements destroyed,
-        * new elements created in it. The list owns the created elements
-        * and the caller maintaines ownership of the list.
-        * @return the number of items in the list.
-        */
-        TInt AllListItemDataL( TBool& aFailedLocked, CApListItemList& aList );
-
-
-        /**
-        * Reads up one access point data
-        * @param aUid The UID of the access point to read
-        * @param aApItem A reference to a CApAccessPointItem to hold the
-        * access point item readed from the database
-        */
-        void AccessPointDataL( TUint32 aUid, CApAccessPointItem& aApItem );
-
-
-        /**
-        * Updates one access point item in the database
-        * @param aApItem A reference to a CApAccessPointItem holding the
-        * access point item to be updated in the database
-        */
-        TBool UpdateAccessPointDataL( CApAccessPointItem& aApItem );
-
-
-        /**
-        * Returns a pointer to the CApDataHandler object
-        */
-        CApDataHandler* DataHandler();
-
-
-        /**
-        * Returns a pointer to the CApUtils object
-        */
-        CApUtils*   ApUtils();
-
-
-        /**
-        * Sets the filtering parameters for the model
-        * @param aParams The filtering parameters to be used
-        */
-        void SetParams( TApSettingsParams aParams );
-
-
-        /**
-        * Gets the filtering parameters of the model
-        * @return The used filtering parameters
-        */
-        TApSettingsParams Params();
-
-
-        /**
-        * Returns a pointer to the VPN engine object
-        */
-        CVpnApEngine* VpnEngine();
-
-
-        /**
-        * Launches help
-        */
-        void LaunchHelpL();
-
-        /**
-        * Deletes an access point specified by its UID
-        * @param aUid The UID of the access point to delete.
-        */
-        void RemoveApL( TUint32 aUid );
-
-
-        /**
-        * Starts a transaction
-        * @param aWrite A boolean indicating whether read or write lock is
-        * needed.
-        * @param aShowNote A boolean indicating whether to show
-        * 'Cannot access database' note or not if DB is locked
-        * @param aRetry A boolean indicating whether to retry or not
-        * if DB is locked
-        * @param aLFFSChecking Whether low disk space is checked or not
-        * @return TTransactionResult containing whther it is our
-        * own transaction or not or it has failed with KErrLocked
-        */
-        TTransactionResult StartTransactionLC
-                                (
-                                TBool aWrite,
-                                TBool aShowNote = ETrue,
-                                TBool aRetry = ETrue,
-                                TBool aLFFSChecking = ETrue
-                                );
-
-        /**
-        * Gets write lock on the database
-        */
-        void  GetWriteLockL();
-
-
-        /**
-        * Cleanup function for the transaction.
-        * In case of leave, it will be called and
-        * transaction will be rolled back
-        */
-        static void RollbackTransactionOnLeave( TAny* aDb );
-
-
-        /**
-        * Commits the transaction on the database
-        */
-        TInt CommitTransaction();
-
-
-        /**
-        * Check if Disk space goes below critical level if allocating
-        * more disk space.
-        * @param aShowErrorNote If ETrue, a warning note is shown.
-        * @param aBytesToWrite Amount of disk space to be allocated (use an
-        * estimate if exact amount is not known).
-        * @return ETrue if allocation would go below critical level.
-        */
-        TBool FFSSpaceBelowCriticalLevelL( TBool aShowErrorNote,
-                                           TInt aBytesToWrite /*=0*/ );
-
-
-        /**
-        * Gets the network list
-        * @param aFailedLocked a boolean indicating if the operation
-        * had failed because the DB was locked
-        * @param aList a reference to the list of networks.
-        * The passed list will be erased, elements destroyed,
-        * new elements created in it. The list owns the created elements
-        * and the caller must maintaine ownership of the list.
-        * Leaves on error (Database and memory errors)
-        * @return the number of items in the list.
-        */
-        TInt NetWorkListDataL( TBool& aFailedLocked, 
-                               CApNetworkItemList& aList );
-
-
-        /**
-        * Returns the model's required IPv type (4, 6 or both, bitfield)
-        */
-        TInt RequestedIPvType();
-
-
-        /**
-        * Returns whether the Select menu item should be deleted or not
-        * @param aResourceId The ID of the current menu resource
-        * @param aCount The number of items in the list
-        */
-        TBool Need2DeleteSelect( TInt aResourceId, TInt aCount );
-        
-
-        /**
-        * Returns whether the Open menu item should be deleted or not
-        * @param aResourceId The ID of the current menu resource
-        * @param aCount The number of items in the list
-        * @param aUid The UID of the current item in the list
-        * @param aNeedsNone Gives whether NONE is displayed as an item or not
-        */
-        TBool Need2DeleteOpen( TInt aResourceId, TInt aCount, 
-                               TUint32 aUid, TBool aNeedsNone );
-
-
-        /**
-        * Returns whether the Delete menu item should be deleted or not
-        * @param aResourceId The ID of the current menu resource
-        * @param aCount The number of items in the list
-        * @param aUid The UID of the current item in the list
-        * @param aNeedsNone Gives whether NONE is displayed as an item or not
-        */
-        TBool Need2DeleteDeleteL( TInt aResourceId, TInt aCount, 
-                                  TUint32 aUid, TBool aNeedsNone );
-
-
-        /**
-        * Returns tha the New/Use existing menu item should be deleted or not
-        * @param aResourceId The ID of the current menu resource
-        * @param aCount The number of items in the list
-        */
-        TBool Need2DeleteNewUseExisting(  TInt aResourceId, TInt aCount );
-
-
-        /**
-        * @param aResourceId The ID of the current menu resource
-        * Returns whether the New menu item should be deleted or not
-        */
-        TBool Need2DeleteNewL(  TInt aResourceId );
-
-
-        /**
-        * Returns whether the Help menu item should be deleted or not
-        */
-        TBool Need2DeleteHelp(  TInt aResourceId );
-
-
-    protected:
-    
-
-
-        
-    public:
-        /**
-        * Returns the name of the first VPN accesspoint with which the access
-        * point with the passed WAP UID is associated.
-        * Name is placed on the CleanupStack if not null.
-        * Should not be called upon VPN access points!!!
-        * @param aUid The WAP UID of the normal access point
-        * @return NULL or a pointer to the name of the associated access point.
-        */
-        HBufC* GetLinkedVpnAccessPointLC( TUint32 aUid );
-
-        
-        /*
-        * Returns the current EikEnvironment
-        */
-        CEikonEnv* EikEnv();
-
-
-
-        /**
-        * Creates a new access point from the passed item.
-        * @param aApItem A reference to a CApAccessPointItem holding the
-        * access point item to be added to the database
-        * @return The UID of the newly created and saved access point.
-        */
-        TUint32 CreateFromDataL( CApAccessPointItem& aApItem );
-
-
-        /**
-        * Handles WEP security settings
-        * Leaves on errors
-        * Return TInt giving exit or shutdown required if any, otherwise, 0
-        */
-        TInt ChangeWepSettingsL( CApAccessPointItem* aApItem );
-
-
-        /**
-        * Handles WPA security settings
-        * Leaves on errors
-        * Return TInt giving exit or shutdown required if any, otherwise, 0
-        */
-        TInt ChangeWpaSettingsL( CApAccessPointItem* aApItem );
-
-
-        /**
-        * Handles 802.1x security settings
-        * Leaves on errors
-        * Return TInt giving exit or shutdown required if any, otherwise, 0
-        */
-        TInt Change8021xSettingsL( CApAccessPointItem* aApItem );
-
-        /**
-        * Resets all WEP and WPA settings to NULL, thus forcing their 
-        * re-load
-        */
-        void ClearWEPAndWPASettings();
-
-        /*
-        * Writes the WLAN settings part
-        */
-        void WriteWlanL( CApAccessPointItem& aApItem, TBool aIsNew );
-
-
-        /*
-        * Loads the WLAN settings part
-        */
-        void LoadWlanL( CApAccessPointItem& aApItem );
-
-        /**
-        * Returns whether the passed item has the security settings
-        * filled correctly or not.
-        */
-        TBool HasWlanSecSettingsFilledL( CApAccessPointItem& aApItem );
-        
-        
-        /**
-        * Update the security mode to reflect current state.
-        * Called after the user changed security settings
-        * @param aApItem The access point item containing the current settings
-        */
-        void UpdateSecurityModeL( CApAccessPointItem& aApItem );
-
-
-    private:    // data
-        CActiveApDb*                iDb;
-        CApDataHandler*             iApData;
-        CApUtils*                   iUtils;
-        CApSettingsDeleteOperation* iop;
-        TApSettingsParams           iParams;
-        TBool                       iDbOwned;
-        TInt                        iReqIpvType;
-        TVpnFilterType              iVpnFilterType;
-        CVpnApEngine*               iVpnApEngine;
-        TInt                        iVariant;       /// Local variant value
-        TBool                       iIncludeEasyWlan;
-
-        CEikonEnv*                  iEikEnv;        /// Eikon environment
-
-    public:
-        CWEPSecuritySettings*       iWepSecSettings;    ///< WEP settings data
-        TInt                        iWepUiExitReason;   ///< WEP UI exit reason
-
-        CWPASecuritySettings*       iWpaSecSettings;    ///< WPA settings data
-        TInt                        iWpaUiExitReason;   ///< WPA UI exit reason
-        TBool                       iNoEdit;
-        
-        /**
-        * CFeatureManagerWrapper wraps FeatureManager to eliminate maintenance 
-        * of existance of FeatureManager.
-        * Owned.
-        */
-        CFeatureManagerWrapper*     iFeatureManagerWrapper;
-        
-        TBool                       iInRefresh;
-        TBool                       iNeedRefresh;
-        TBool                       iHelpSupported;
-        TBool                       iProtectionSupported;
-    };
-
-
-#endif
-
-// End of file
--- a/apengine/apsettingshandlerui/inc/Apsettingsdeleteoperation.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,246 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of class CApSettingsDeleteOperation.
-*
-*/
-
-
-#ifndef APSETTINGS_DELETE_OPERATION_H
-#define APSETTINGS_DELETE_OPERATION_H
-
-// INCLUDE FILES
-#include <ApDataHandler.h>
-#include <AknProgressDialog.h>
-// CONSTANTS
-
-// DATA TYPES
-
-// FORWARD DECLARATION
-class CActiveApDb;
-class CApSettingsModel;
-class CAknWaitDialog;
-class CErrorUI;
-
-// CLASS DECLARATION
-
-/**
-* Model for the access point settings ui.
-*/
-NONSHARABLE_CLASS( CApSettingsDeleteOperation ) : 
-                    public CActive, public MProgressDialogCallback
-    {
-    public:
-        enum TState             /// State of the finite state machine.
-            {
-            EProcOnDialogOn,
-            EProcOffDialogOn,
-            EProcOnDialogOff,
-            EProcOffDialogOff
-            };
-
-    public:     // Construct / destruct
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @param aNoteControlId The ID of the note control.
-        * @param aResourceID The resource ID of the wait note dialog.
-        * @param aUid The UID of the access point to delete.
-        * @param aNoteText The label for the note text.
-        * @return The constructed CApSettingsDeleteOperation object.
-        */
-        static CApSettingsDeleteOperation* NewL(
-                                TInt aNoteControlId,
-                                TInt aResourceID,
-                                TUint32 aUid,
-                                const TDesC& aNoteText
-                                );
-
-
-        /**
-        * Destructor.
-        */
-        virtual ~CApSettingsDeleteOperation();
-
-
-    protected:  // new functions
-        /**
-        * Constructor.
-        * @param aNoteControlId The ID of the note control.
-        * @param aResourceID The resource ID of the wait note dialog.
-        * @param aUid The UID of the access point to delete.
-        */
-        CApSettingsDeleteOperation(
-                                TInt aNoteControlId,
-                                TInt aResourceID,
-                                TUint32 aUid
-                                );
-
-        /**
-        * Second phase constructor. Leaves on failure.
-        * @param aNoteText The desired text of the note.
-        * events.
-        */
-        void ConstructL( const TDesC& aNoteText );
-
-    protected:  // from CActive
-        /**
-        * Run a step of the observer test.
-        */
-        void RunL();
-
-        /**
-        * Cancel protocol implementation.
-        * must be present although does nothing
-        * as it is pure virtual in base...
-        */
-        void DoCancel();
-
-        /**
-        * Callback for notification of the dismissal of the wait note dialog.
-        * From MProgressDialogCallback.
-        * The passed aButtonId is ignored.
-        */
-        virtual void DialogDismissedL( TInt aButtonId );
-
-    public:     // new methods
-
-        /**
-        * Start the operation.
-        */
-        void StartL();
-
-
-        /**
-        * Moves into next wait round and forces RunL to execute.
-        */
-        void Next();
-
-
-        /**
-        * Starts the wait note with the current params.
-        */
-        void StartWaitNoteL();
-
-
-        /**
-        * Starts the separate delete operation thread with the current params.
-        */
-        void StartDeleteOperationThreadL();
-
-
-        /**
-        * Separate thread for the delete operation.
-        * @param aPtr   A pointer to the operation to be started in the thread
-        * @return The return code of the delete operation
-        */
-        static TInt RunDeleteThread( TAny* aPtr );
-
-
-        /**
-        * Separate thread for the delete operation.
-        * @param aop   A pointer to the operation to be started in the thread
-        * @return The return code of the delete operation
-        */
-        static TInt DoRunDeleteThreadL( CApSettingsDeleteOperation* aop );
-
-
-        /**
-        * Starts a transaction on the given database
-        * @param aDb Pointer to the database object
-        * @param aWrite boolean indicating whether write or read lock is needed
-        * @param aRetry boolean indicating whether retry is needed
-        * @return Whether the transaction is our own or not
-        */
-        static TBool StartTransactionLC
-                            (
-                            CCommsDatabase* aDb,
-                            TBool aWrite,
-                            TBool aRetry /* ETrue */
-                            );
-
-
-        /**
-        * Gets write lock for the given database
-        * @param aDb Pointer to the database object
-        */
-        static void GetWriteLockL( CCommsDatabase* aDb );
-
-
-        /**
-        * Cleanup function for the transaction.
-        * In case of leave, it will be called and
-        * transaction will be rolled back
-        */
-        static void RollbackTransactionOnLeave( TAny* aDb );
-
-
-        /**
-        * Get the list of VPN WAP Access point UID's which are linked to a 
-        * specific normal internet access point WAP ID.
-        * @param aDb a reference of a CCommsDatabase database object 
-        * to operate on
-        * @param aUid a TUint32 containing the WAP UID of the normal 
-        * internet access point
-        * @param aVpnList a TUint32 dynamic array passed by reference to 
-        * hold the WAP UID's of the linked VPN access points.
-        */
-/*
-        static void GetLinkedVpnAccessPointsL( CCommsDatabase& aDb,
-                                        TUint32 aUid, 
-                                        CArrayFixFlat<TUint32> &aVpnList );
-*/
-
-        /**
-        * Reads up an integer from the given table
-        * @param atable The CCommsDbTableView* table to perform the operation
-        * @param aColumn The column to read
-        * @param aValue A TUint32 passed by reference to hold the readed value.
-        * @return TInt Error code. Returns either 0 or KErrnotFound. 
-        * Leaves on any other error
-        */
-        static TInt ReadUintL( CCommsDbTableView* atable,
-                               const TDesC& aColumn,
-                               TUint32& aValue );
-
-        /**
-        * Returns the current state.
-        */
-        TState State(){ return iState;};
-        
-        /**
-        * Set a new UID
-        */
-        void SetUid( TUint32 aUid ) { iUid = aUid;};
-        
-        
-        /**
-        * Set a new note-text
-        */
-        void SetNoteTextL( const TDesC& aNoteText );
-
-    private:    // data
-        TInt                iNoteControlId;
-        TInt                iResourceID;
-        TUint32             iUid;
-        RThread             iDeleteOperation;
-        HBufC*              iNoteText;
-        CAknWaitDialog*     iWaitDialog;
-        TState              iState;
-        CErrorUI*           iErrorUi;
-        TInt                iErr;
-    };
-
-
-#endif
-
-// End of file
--- a/apengine/apsettingshandlerui/inc/ApsettingshandleruiImpl.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1331 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declares the main implementation, CApSettingsHandlerImpl for the 
-*     Access Point settings.
-*
-*/
-
-
-#ifndef APSETTINGS_HANDLER_IMPL_H
-#define APSETTINGS_HANDLER_IMPL_H
-
-// INCLUDES
-#include <ApSettingsHandlerCommons.h>
-#include <ApEngineConsts.h>
-#include <ApSelect.h>
-
-// CONSTANTS
-/*
-const   TUid    KUidApSettingsHandler = { 0x10008d3B };
-*/
-
-typedef struct      ///< Extra data holder
-    {
-        TInt                iResOffset;
-        TBool               iIsIpv6Supported;       // Default is NO 
-        TBool               iIsFeatureManagerInitialised;
-        TInt                iExtra;
-        TInt                iSortType;
-        TVpnFilterType      iVpnFilterType;
-        TInt                iVariant;               /// Local variant value
-        TBool               iIncludeEasyWlan;
-    }TApSetHandlerImplExtra;
-
-
-// FORWARD DECLARATIONS
-class CActiveApDb;
-class CApSelector;
-class CApSettingsModel;
-class CApSettings;
-class CTextOverrides;
-class CApAccessPointItem;
-
-
-// CLASS DECLARATION
-/**
-* CApSettingsHandlerImpl class: It is the main handler for the Access Point 
-* settings. It contains the implementation of the Access Point Settings for
-* the public API to be used by other (sub)systems.
-*
-*/
-NONSHARABLE_CLASS( CApSettingsHandlerImpl ): public CBase
-    {
-
-    public: // Constructors and destructor
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object. It is customizable through 
-        * the parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create access 
-        * points. It has two main parts, Select and Edit. The first parameter,
-        * aStartWithSelection gives whether we would like to select or edit.
-        * In case of selection, there is the possibility to use this module in
-        * many applications. For this, two layouts are implemented, 
-        * one is list pane used by General Settings which provides the list in
-        * a list-pane. The other layout is for the other applications 
-        * requiring access point selection, a popup-list style as the decision
-        * I know about was that General Settings will use list-pane and all
-        * other apps. popup-list style. It is the caller who selects the style
-        * so if spec. says otherwise, this module still can be used.
-        * It is also possible to start the UI without selection, so if any 
-        * module has a 'linked/default/etc.' access point and stored it's UID,
-        * the module can simply call the editor part of the UI without having
-        * to select the AP once more. In case of editing only, 
-        * (aStartWithSelection is EFalse), all other construction parameters 
-        * are ignored and after construction caller can simply call 
-        * DoRunSettingsL(..). In case of selection, a lot of other parameters 
-        * can be specified to fulfil all requirements. There are three types 
-        * of Options menu available: 
-        * EApSettingsSelMenuNormal, 
-        * EApSettingsSelMenuSelectOnly,
-        * EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly: Only Select is visible, 
-        *                               no way to edit, delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:    Options menu specified in General 
-        *                               Settings, contains Edit, Delete, 
-        *                               Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal: Same as in EApSettingsSelMenuNormal
-        *                                BUT the first item is Select. 
-        *                                This one makes it possible to select 
-        *                                an access point and also possible to 
-        *                                edit, create, delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering 
-        * criteria for the selection list creation. First, it is possible to
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly:  Filter allows only access points that are
-        *                           capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly:       Filter allows only access points that are 
-        *                           capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP: Filter allows only access points that are
-        *                           capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory:  Filter allows only access points that are
-        *                           capable of WAP access AND contain 
-        *                           mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll:           No filtering is done for the isp-type,
-        *                           all types of access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together 
-        * the values, filtering will be done in such a way that only access 
-        * points with the listed ISP-types will be shown. Second filtering
-        * possibility (aBearerFilter) is the desired bearer type. The possible
-        * values are the values of the TApBearerType enum type and their 
-        * combinations, as in case of the ISP type. The ordering of the list
-        * can be specified with the aSortType parameter. It can have the
-        * following values:
-        * KEApSortUidAscending:     The sorting is done according to the ID 
-        *                           of the access points in ascending order.
-        * KEApSortUidDescending:    The sorting is done according to the ID 
-        *                           of the access points in descending order.
-        * KEApSortNameAscending:    The sorting is done according to the name
-        *                           of the access points in ascending order.
-        * KEApSortNameDescending:   The sorting is done according to the name
-        *                           of the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aStartWithSelection    A boolean value indicating whether to 
-        *                               select or edit an ap.
-        * @param aListType      A TSelectionListType enum indicating the 
-        *                       desired list type.
-        * @param aSelMenuType   A TSelectionMenuType enum indicating the 
-        *                       desired menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aNoEdit            Gives wether editing is allowed or not
-        * @return The constructed CApSettingsHandlerImpl object.
-        */
-        static CApSettingsHandlerImpl* NewLC(
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType,
-                        TBool aNoEdit
-                        );
-
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object. It is customizable through 
-        * the parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create 
-        * access points. It has two main parts, Select and Edit. The first 
-        * parameter, aStartWithSelection gives whether we would like to select
-        * or edit. In case of selection, there is the possibility to use this 
-        * module in many applications. For this, two layouts are implemented,
-        * one is list pane used by General Settings which provides the list 
-        * in a list-pane. The other layout is for the other applications 
-        * requiring access point selection, a popup-list style as the 
-        * decision I know about was that General Settings will use list-pane 
-        * and all other apps. popup-list style. It is the caller who selects 
-        * the style so if spec. says otherwise, this module still can be used.
-        * It is also possible to start the UI without selection, so if any 
-        * module has a 'linked/default/etc.' access point and stored it's UID,
-        * the module can simply call the editor part of the UI without having
-        * to select the AP once more.
-        * In case of editing only, (aStartWithSelection is EFalse), all other 
-        * construction parameters are ignored and after construction caller 
-        * can simply call DoRunSettingsL(..).
-        * In case of selection, a lot of other parameters can be specified 
-        * to fulfil all requirements. There are three types of Options menu 
-        * available: 
-        * EApSettingsSelMenuNormal, 
-        * EApSettingsSelMenuSelectOnly,
-        * EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly:     Only Select is visible, no way to
-        *                                   edit, delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:        Options menu specified in General 
-        *                                   Settings, contains Edit, Delete, 
-        *                                   Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal:  Same as in EApSettingsSelMenuNormal
-        *                                   BUT the first item is Select. 
-        *                                   This one makes it possible to 
-        *                                   select an access point and also 
-        *                                   possible to edit, create, 
-        *                                   delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering 
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly:      Filter allows only access points that
-        *                               are capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly:           Filter allows only access points that 
-        *                               are capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP:    Filter allows only access points that
-        *                               are capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory:      Filter allows only access points that
-        *                               are capable of WAP access AND contain
-        *                               mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll:               No filtering is done for the isp-type,
-        *                               all types of access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the
-        * values, filtering will be done in such a way that only access points
-        * with the listed ISP-types will be shown.
-        * Second filtering possibility (aBearerFilter) is the desired bearer 
-        * type. The possible values are the values of the TApBearerType enum 
-        * type and their combinations, as in case of the ISP type.
-        * The ordering of the list can be specified with the aSortType 
-        * parameter. It can have the following values:
-        * KEApSortUidAscending:     The sorting is done according to the ID
-        *                           of the access points in ascending order.
-        * KEApSortUidDescending:    The sorting is done according to the ID 
-        *                           of the access points in descending order.
-        * KEApSortNameAscending:    The sorting is done according to the name 
-        *                           of the access points in ascending order.
-        * KEApSortNameDescending:   The sorting is done according to the name
-        *                           of the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aDb A database to work on
-        * @param aStartWithSelection A boolean value indicating whether to 
-        * select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        * list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        * menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aNoEdit            Gives wether editing is allowed or not
-        * @return The constructed CApSettingsHandlerImpl object.
-        */
-        static CApSettingsHandlerImpl* NewLC(
-                        CActiveApDb& aDb,
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType,
-                        TBool aNoEdit
-                        );
-
-
-
-
-
-
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object.It is customizable through the
-        * parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create access 
-        * points. It has two main parts, Select and Edit. The first parameter, 
-        * aStartWithSelection gives whether we would like to select or edit.
-        * In case of selection, there is the possibility to use this module in
-        * many applications. For this, two layouts are implemented, one is 
-        * list pane used by General Settings which provides the list in a 
-        * list-pane. The other layout is for the other applications requiring 
-        * access point selection, a popup-list style as the decision was that 
-        * General Settings will use list-pane and all other apps. popup-list 
-        * style. It is the caller who selects the style so if spec. says 
-        * otherwise, this module still can be used.
-        * It is also possible to start the UI without selection, so if any 
-        * module has a 'linked/default/etc.' access point and stored it's UID,
-        * the module can simply call the editor part of the UI without having
-        * to select the AP once more.
-        * In case of editing only, (aStartWithSelection is EFalse), all other 
-        * construction parameters are ignored and after construction caller 
-        * can simply call DoRunSettingsL(..).
-        * In case of selection, a lot of other parameters can be specified to
-        * fulfil all requirements. There are three types of Options menu 
-        * available: EApSettingsSelMenuNormal, EApSettingsSelMenuSelectOnly,
-        * EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly: Only Select is visible, no way to edit,
-        *   delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:Options menu specified in General Settings,
-        *   contains Edit, Delete, Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal: Same as in EApSettingsSelMenuNormal 
-        *   BUT the first item is Select. This one makes it possible to select 
-        *   an access point and also possible to edit, create, delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering 
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly: Filter allows only access points that are 
-        *   capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly: Filter allows only access points that are 
-        *   capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP: Filter allows only access points that are 
-        *   capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory: Filter allows only access points that are 
-        *   capable of WAP access AND contain mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll: No filtering is done for the isp-type, all types of
-        *   access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the 
-        * values, filtering will be done in such a way that only access points 
-        * with the listed ISP-types will be shown.
-        * Second filtering possibility (aBearerFilter) is the desired bearer 
-        * type. The possible values are the values of the TApBearerType enum 
-        * type and their combinations, as in case of the ISP type.
-        * The ordering of the list can be specified with the aSortType 
-        * parameter. It can have the following values:
-        * KEApSortUidAscending: The sorting is done according to the ID of 
-        *   the access points in ascending order.
-        * KEApSortUidDescending: The sorting is done according to the ID of 
-        *   the access points in descending order.
-        * KEApSortNameAscending: The sorting is done according to the name of 
-        *   the access points in ascending order.
-        * KEApSortNameDescending: The sorting is done according to the name of 
-        *   the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @param aNoEdit            Gives wether editing is allowed or not
-        * @return The constructed CApSettingsHandlerImpl object.
-        */
-        static CApSettingsHandlerImpl* NewLC(
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType,
-                        TInt aReqIpvType,
-                        TBool aNoEdit
-                        );
-
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object. It is customizable through 
-        * the parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create access 
-        * points. It has two main parts, Select and Edit. The first parameter,
-        * aStartWithSelection gives whether we would like to select or edit.
-        * In case of selection, there is the possibility to use this module in
-        * many applications. For this, two layouts are implemented, one is list
-        * pane used by General Settings which provides the list in a list-pane.
-        * The other layout is for the other applications requiring access point
-        * selection, a popup-list style as the decision was that General 
-        * Settings will use list-pane and all other apps. popup-list style. 
-        * It is the caller who selects the style so if spec. says otherwise,
-        * this module still can be used. It is also possible to start the UI 
-        * without selection, so if any module has a 'linked/default/etc.'
-        * access point and stored it's UID, the module can simply call the 
-        * editor part of the UI without having to select the AP once more.
-        * In case of editing only, (aStartWithSelection is EFalse), all other 
-        * construction parameters are ignored and after construction caller can
-        * simply call DoRunSettingsL(..). In case of selection, a lot of other
-        * parameters can be specified to fulfil all requirements. There are 
-        * three types of Options menu available: EApSettingsSelMenuNormal, 
-        * EApSettingsSelMenuSelectOnly, EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly: Only Select is visible, no way to edit,
-        *   delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:Options menu specified in General Settings,
-        *   contains Edit, Delete, Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal: Same as in EApSettingsSelMenuNormal 
-        *   BUT the first item is Select. This one makes it possible to select
-        *   an access point and also possible to edit, create, delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly: Filter allows only access points that are 
-        *   capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly: Filter allows only access points that are 
-        *   capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP: Filter allows only access points that are 
-        *   capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory: Filter allows only access points that are 
-        *   capable of WAP access AND contain mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll: No filtering is done for the isp-type, all types of
-        *   access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the
-        * values, filtering will be done in such a way that only access points
-        * with the listed ISP-types will be shown. Second filtering possibility
-        * (aBearerFilter) is the desired bearer type. The possible values are 
-        * the values of the TApBearerType enum type and their combinations, as
-        * in case of the ISP type. The ordering of the list can be specified 
-        * with the aSortType parameter. It can have the following values:
-        * KEApSortUidAscending: The sorting is done according to the ID of 
-        *   the access points in ascending order.
-        * KEApSortUidDescending: The sorting is done according to the ID of 
-        *   the access points in descending order.
-        * KEApSortNameAscending: The sorting is done according to the name of
-        *   the access points in ascending order.
-        * KEApSortNameDescending: The sorting is done according to the name of
-        *   the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aDb A database to work on
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @param aNoEdit            Gives wether editing is allowed or not
-        * @return The constructed CApSettingsHandlerImpl object.
-        */
-        static CApSettingsHandlerImpl* NewLC(
-                        CActiveApDb& aDb,
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType,
-                        TInt aReqIpvType,
-                        TBool aNoEdit
-                        );
-
-
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object.It is customizable through the
-        * parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create access 
-        * points. It has two main parts, Select and Edit. The first parameter, 
-        * aStartWithSelection gives whether we would like to select or edit.
-        * In case of selection, there is the possibility to use this module in
-        * many applications. For this, two layouts are implemented, one is 
-        * list pane used by General Settings which provides the list in a 
-        * list-pane. The other layout is for the other applications requiring 
-        * access point selection, a popup-list style as the decision was that 
-        * General Settings will use list-pane and all other apps. popup-list 
-        * style. It is the caller who selects the style so if spec. says 
-        * otherwise, this module still can be used.
-        * It is also possible to start the UI without selection, so if any 
-        * module has a 'linked/default/etc.' access point and stored it's UID,
-        * the module can simply call the editor part of the UI without having
-        * to select the AP once more.
-        * In case of editing only, (aStartWithSelection is EFalse), all other 
-        * construction parameters are ignored and after construction caller 
-        * can simply call DoRunSettingsL(..).
-        * In case of selection, a lot of other parameters can be specified to
-        * fulfil all requirements. There are three types of Options menu 
-        * available: EApSettingsSelMenuNormal, EApSettingsSelMenuSelectOnly,
-        * EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly: Only Select is visible, no way to edit,
-        *   delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:Options menu specified in General Settings,
-        *   contains Edit, Delete, Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal: Same as in EApSettingsSelMenuNormal 
-        *   BUT the first item is Select. This one makes it possible to select 
-        *   an access point and also possible to edit, create, delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering 
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly: Filter allows only access points that are 
-        *   capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly: Filter allows only access points that are 
-        *   capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP: Filter allows only access points that are 
-        *   capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory: Filter allows only access points that are 
-        *   capable of WAP access AND contain mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll: No filtering is done for the isp-type, all types of
-        *   access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the 
-        * values, filtering will be done in such a way that only access points 
-        * with the listed ISP-types will be shown.
-        * Second filtering possibility (aBearerFilter) is the desired bearer 
-        * type. The possible values are the values of the TApBearerType enum 
-        * type and their combinations, as in case of the ISP type.
-        * The ordering of the list can be specified with the aSortType 
-        * parameter. It can have the following values:
-        * KEApSortUidAscending: The sorting is done according to the ID of 
-        *   the access points in ascending order.
-        * KEApSortUidDescending: The sorting is done according to the ID of 
-        *   the access points in descending order.
-        * KEApSortNameAscending: The sorting is done according to the name of 
-        *   the access points in ascending order.
-        * KEApSortNameDescending: The sorting is done according to the name of 
-        *   the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        * @param aNoEdit            Gives wether editing is allowed or not
-        * @return The constructed CApSettingsHandlerImpl object.
-        */
-        static CApSettingsHandlerImpl* NewLC(
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType,
-                        TInt aReqIpvType,
-                        TVpnFilterType aVpnFilterType,
-                        TBool aNoEdit
-                        );
-
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object. It is customizable through 
-        * the parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create access 
-        * points. It has two main parts, Select and Edit. The first parameter,
-        * aStartWithSelection gives whether we would like to select or edit.
-        * In case of selection, there is the possibility to use this module in
-        * many applications. For this, two layouts are implemented, one is list
-        * pane used by General Settings which provides the list in a list-pane.
-        * The other layout is for the other applications requiring access point
-        * selection, a popup-list style as the decision was that General 
-        * Settings will use list-pane and all other apps. popup-list style. 
-        * It is the caller who selects the style so if spec. says otherwise,
-        * this module still can be used. It is also possible to start the UI 
-        * without selection, so if any module has a 'linked/default/etc.'
-        * access point and stored it's UID, the module can simply call the 
-        * editor part of the UI without having to select the AP once more.
-        * In case of editing only, (aStartWithSelection is EFalse), all other 
-        * construction parameters are ignored and after construction caller can
-        * simply call DoRunSettingsL(..). In case of selection, a lot of other
-        * parameters can be specified to fulfil all requirements. There are 
-        * three types of Options menu available: EApSettingsSelMenuNormal, 
-        * EApSettingsSelMenuSelectOnly, EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly: Only Select is visible, no way to edit,
-        *   delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:Options menu specified in General Settings,
-        *   contains Edit, Delete, Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal: Same as in EApSettingsSelMenuNormal 
-        *   BUT the first item is Select. This one makes it possible to select
-        *   an access point and also possible to edit, create, delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly: Filter allows only access points that are 
-        *   capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly: Filter allows only access points that are 
-        *   capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP: Filter allows only access points that are 
-        *   capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory: Filter allows only access points that are 
-        *   capable of WAP access AND contain mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll: No filtering is done for the isp-type, all types of
-        *   access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the
-        * values, filtering will be done in such a way that only access points
-        * with the listed ISP-types will be shown. Second filtering possibility
-        * (aBearerFilter) is the desired bearer type. The possible values are 
-        * the values of the TApBearerType enum type and their combinations, as
-        * in case of the ISP type. The ordering of the list can be specified 
-        * with the aSortType parameter. It can have the following values:
-        * KEApSortUidAscending: The sorting is done according to the ID of 
-        *   the access points in ascending order.
-        * KEApSortUidDescending: The sorting is done according to the ID of 
-        *   the access points in descending order.
-        * KEApSortNameAscending: The sorting is done according to the name of
-        *   the access points in ascending order.
-        * KEApSortNameDescending: The sorting is done according to the name of
-        *   the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aDb A database to work on
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        * @param aNoEdit            Gives wether editing is allowed or not
-        * @return The constructed CApSettingsHandlerImpl object.
-        */
-        static CApSettingsHandlerImpl* NewLC(
-                        CActiveApDb& aDb,
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType,
-                        TInt aReqIpvType,
-                        TVpnFilterType aVpnFilterType,
-                        TBool aNoEdit
-                        );
-
-
-
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object. It is customizable through 
-        * the parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create access 
-        * points. It has two main parts, Select and Edit. The first parameter,
-        * aStartWithSelection gives whether we would like to select or edit.
-        * In case of selection, there is the possibility to use this module in
-        * many applications. For this, two layouts are implemented, one is list
-        * pane used by General Settings which provides the list in a list-pane.
-        * The other layout is for the other applications requiring access point
-        * selection, a popup-list style as the decision was that General 
-        * Settings will use list-pane and all other apps. popup-list style. 
-        * It is the caller who selects the style so if spec. says otherwise,
-        * this module still can be used. It is also possible to start the UI 
-        * without selection, so if any module has a 'linked/default/etc.'
-        * access point and stored it's UID, the module can simply call the 
-        * editor part of the UI without having to select the AP once more.
-        * In case of editing only, (aStartWithSelection is EFalse), all other 
-        * construction parameters are ignored and after construction caller can
-        * simply call DoRunSettingsL(..). In case of selection, a lot of other
-        * parameters can be specified to fulfil all requirements. There are 
-        * three types of Options menu available: EApSettingsSelMenuNormal, 
-        * EApSettingsSelMenuSelectOnly, EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly: Only Select is visible, no way to edit,
-        *   delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:Options menu specified in General Settings,
-        *   contains Edit, Delete, Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal: Same as in EApSettingsSelMenuNormal 
-        *   BUT the first item is Select. This one makes it possible to select
-        *   an access point and also possible to edit, create, delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly: Filter allows only access points that are 
-        *   capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly: Filter allows only access points that are 
-        *   capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP: Filter allows only access points that are 
-        *   capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory: Filter allows only access points that are 
-        *   capable of WAP access AND contain mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll: No filtering is done for the isp-type, all types of
-        *   access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the
-        * values, filtering will be done in such a way that only access points
-        * with the listed ISP-types will be shown. Second filtering possibility
-        * (aBearerFilter) is the desired bearer type. The possible values are 
-        * the values of the TApBearerType enum type and their combinations, as
-        * in case of the ISP type. The ordering of the list can be specified 
-        * with the aSortType parameter. It can have the following values:
-        * KEApSortUidAscending: The sorting is done according to the ID of 
-        *   the access points in ascending order.
-        * KEApSortUidDescending: The sorting is done according to the ID of 
-        *   the access points in descending order.
-        * KEApSortNameAscending: The sorting is done according to the name of
-        *   the access points in ascending order.
-        * KEApSortNameDescending: The sorting is done according to the name of
-        *   the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aDb A database to work on
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        * @param aIncludeEasyWlan a TBool indicating whether it should 
-        *   include the easy wlan AP in the list or not.
-        * @param aNoEdit            Gives wether editing is allowed or not
-        * @return The constructed CApSettingsHandlerImpl object.
-        */
-        static CApSettingsHandlerImpl* NewLC(
-                        CActiveApDb& aDb,
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType,
-                        TInt aReqIpvType,
-                        TVpnFilterType aVpnFilterType,
-                        TBool aIncludeEasyWlan,
-                        TBool aNoEdit
-                        );
-
-
-
-
-        /**
-        * Destructor.
-        */
-        ~CApSettingsHandlerImpl();
-
-
-    protected:
-        /**
-        * Constructor.
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aNoEdit        Gives wether editing is allowed or not
-        */
-        CApSettingsHandlerImpl(
-                                    TBool aStartWithSelection,
-                                    TSelectionListType aListType,
-                                    TSelectionMenuType aSelMenuType,
-                                    TBool aNoEdit
-                                    );
-
-        /**
-        * Constructor.
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aHelpMajor     Major help ID
-        * @param aNoEdit        Gives wether editing is allowed or not
-        */
-        CApSettingsHandlerImpl(
-                                    TBool aStartWithSelection,
-                                    TSelectionListType aListType,
-                                    TSelectionMenuType aSelMenuType,
-                                    TUid aHelpMajor,
-                                    TBool aNoEdit
-                                    );
-
-
-        /**
-        * Constructor.
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aNeedIpv6Support Whether IPv6 is supported or not
-        * @param aNoEdit        Gives wether editing is allowed or not
-        */
-        CApSettingsHandlerImpl(
-                            TBool aStartWithSelection,
-                            TSelectionListType aListType,
-                            TSelectionMenuType aSelMenuType,
-                            TBool aNeedIpv6Support,
-                            TBool aNoEdit
-                            );
-
-
-
-        /**
-        * Second-phase constructor.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        */
-        void ConstructL(
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType
-                                );
-
-
-        /**
-        * Second-phase constructor.
-        * @param aDb A database to work on
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        */
-        void ConstructL(
-                                CActiveApDb& aDb,
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType
-                                );
-
-
-        /**
-        * Second-phase constructor.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        */
-        void ConstructL(
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType,
-                                TVpnFilterType aVpnFilterType
-                                );
-
-
-        /**
-        * Second-phase constructor.
-        * @param aDb A database to work on
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        */
-        void ConstructL(
-                                CActiveApDb& aDb,
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType,
-                                TVpnFilterType aVpnFilterType
-                                );
-
-
-
-
-        /**
-        * Second-phase constructor.
-        * @param aDb A database to work on
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        * @param aIncludeEasyWlan a TBool indicating whether it should 
-        *   include the easy wlan AP in the list or not.
-        */
-        void ConstructL(
-                                CActiveApDb& aDb,
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType,
-                                TVpnFilterType aVpnFilterType,
-                                TBool aIncludeEasyWlan
-                                );
-
-
-    public: // New functions
-        /**
-        * Sets the filtering used in the access point selection.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @return No return value. Leaves on error.
-        */
-        void SetFilterL(
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType
-                                );
-
-
-        /**
-        * Sets possible overrides of some texts.
-        * By default, text is read from resources. This provides a way to 
-        * change some of the text to a caller-supplied one. The text must 
-        * be read from resource and must be already localized.
-        * More than one text can be substituted, they are stored internally
-        * in an array.
-        * Currently not supported and supporting it is under discussion.
-        * @param aText2Change TTextID to identify the text to be replaced with
-        * @param aNewText Reference to the substitute text.
-        */
-        void SetTextOverrideL( TTextID aText2Change, 
-                                        const TDesC& aNewText );
-
-
-        /**
-        * Gets possible overrides of a text.
-        * By default, text is read from resources. This provides a way to 
-        * change some of the text to a caller-supplied one. The text must
-        * be read from resource and must be already localized.
-        * More than one text can be substituted, they are stored internally
-        * in an array.
-        * Currently not supported and supporting it is under discussion
-        * @param aTextID TTextID type to identify the text to be replaced with
-        * @return Reference to the substitute text.
-        */
-        const TDesC& TextOverrideL( TTextID aTextId );
-
-
-        /**
-        * Starts the settings component.
-        * Creates dialog(s) from scratch, launches and executes them.
-        * Can leave with error codes.
-        * @param TUint32 aHighlight The UID of the AP to highlight by default
-        * @param TUint32 aSelected The UID of the access point selected 
-        * by the user.
-        * @return The accomplished task's flag-codes:
-        * <br>
-        * KApUiEventNone,
-        * <br>
-        * KApUiEventSelected,
-        * <br>
-        * KApUiEventCreatedBlank,
-        * <br>
-        * KApUiEventCreatedUsedOld,
-        * <br>
-        * KApUiEventEdited,
-        * <br>
-        * KApUiEventDeleted,
-        * <br>
-        * KApUiEventExitRequested
-        * <br>and their combinations. ( Bitwise OR )
-        * <br>
-        * aSelected will be modified only if KApUiEventSelected is included 
-        * in the flags.
-        * <br>
-        * In case it returns KApUiEventExitRequested, the user had choosen
-        * the Exit option from the Options menu which means
-        * that the caller application MUST exit!
-        * <br>
-        * Returns after completion!
-        */
-        TInt RunSettingsL( TUint32 aHighLight, TUint32& aSelected );
-
-
-        /**
-        * Component Validation Test.
-        * @return KErrNone.
-        */
-        static TInt Cvt();
-
-
-    protected:  // New functions
-        /**
-        * Starts the settings component.
-        * Creates dialog(s) from scratch, launches and executes them.
-        * In case of error, leaves with error codes.
-        * @param TUint32 aHighlight The UID of the AP to highlight by default
-        * @param TUint32 aSelected The UID of the AP selected by the user
-        * @return The accomplished task's flag-codes:
-        * <br>
-        * KApUiEventNone,
-        * <br>
-        * KApUiEventSelected,
-        * <br>
-        * KApUiEventCreatedBlank,
-        * <br>
-        * KApUiEventCreatedUsedOld,
-        * <br>
-        * KApUiEventEdited,
-        * <br>
-        * KApUiEventDeleted
-        * <br>
-        * and their combinations. ( Bitwise OR )
-        * <br>
-        * aSelected will be modified only if KApUiEventSelected is included 
-        * in the flags.
-        * <br>
-        * Returns after completion!
-        */
-        TInt DoRunSettingsL( TUint32 aHighLight, TUint32& aSelected );
-
-
-        /**
-        * Starts the viewer component.
-        * Creates dialog(s) from scratch, launches and executes it.
-        * In case of error, leaves with error codes.
-        * @param TUint32 aUid The UID of the AP to view/edit
-        * @return Returns the completed task's flags
-        * KApUiEventNone, KApUiEventSelected, KApUiEventCreatedBlank,
-        * KApUiEventCreatedUsedOld, KApUiEventEdited, KApUiEventDeleted,
-        * KApUiEventExitRequested and their combinations. ( Bitwise OR )
-        * In case it returns KApUiEventExitRequested, the user had choosen
-        * the Exit option from the Options menu which means
-        * that the caller application MUST exit!
-        * <br>
-        * Returns after completion!
-        */
-        TInt RunViewerL( TUint32 aUid );
-
-
-        /**
-        * Starts the viewer component.
-        * Creates dialog(s) from scratch, launches and executes it.
-        * In case of error, leaves with error codes.
-        * @param TUint32 aUid The UID of the AP to view/edit
-        * @return Returns the completed task's flags
-        * KApUiEventNone, KApUiEventSelected, KApUiEventCreatedBlank,
-        * KApUiEventCreatedUsedOld, KApUiEventEdited, KApUiEventDeleted,
-        * KApUiEventExitRequested and their combinations. ( Bitwise OR )
-        * Returns after completion!
-        */
-        TInt DoRunViewerL( TUint32 aUid );
-
-
-        // handles the Delete access Point command.
-        void HandleApDeleteCmdL( TUint32 aUid, TBool aIsLast );
-
-
-        // handles the Create blank new access Point command.
-        TUint32 HandleApBlankNewL( TInt aBearers, TInt aIsps );
-
-
-        // handles the Create new access Point by using existing one command.
-        TUint32 HandleApUseOldNewL();
-
-
-        // handles the Editing of the newly created access Point.
-        TUint32 EditAfterCreateL( TUint32 aUid, 
-                                  CApAccessPointItem* aItem = NULL );
-
-
-        /**
-        * Second-phase internal constructor.
-        * @param aDb A database to work on
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        * @param aIncludeEasyWlan a TBool indicating whether it should 
-        *   include the easy wlan AP in the list or not.
-        */
-        void DoConstructL( CActiveApDb* aDb, TInt aIspFilter,
-                           TInt aBearerFilter, TInt aSortType,
-                           TVpnFilterType aVpnFilterType,
-                           TBool aIncludeEasyWlan );
-
-
-        /**
-        * Starts the selector component as a list
-        * Creates dialog(s) from scratch, launches and executes them.
-        * In case of error, leaves with error codes.
-        * @param TUint32 aHighlight The UID of the AP to highlight by default
-        * @param TUint32 aSelected The UID of the AP selected by the user
-        * @return The accomplished task's flag-codes:
-        * <br>
-        * KApUiEventNone,
-        * <br>
-        * KApUiEventSelected,
-        * <br>
-        * KApUiEventCreatedBlank,
-        * <br>
-        * KApUiEventCreatedUsedOld,
-        * <br>
-        * KApUiEventEdited,
-        * <br>
-        * KApUiEventDeleted
-        * <br>
-        * and their combinations. ( Bitwise OR )
-        * <br>
-        * aSelected will be modified only if KApUiEventSelected is included 
-        * in the flags.
-        * <br>
-        * Returns after completion!
-        */
-        void DoRunListSettingsL( TUint32 aHighLight, TUint32& aSelected );
-
-
-        /**
-        * Starts the selector component in a setting page
-        * Creates dialog(s) from scratch, launches and executes them.
-        * In case of error, leaves with error codes.
-        * @param TUint32 aHighlight The UID of the AP to highlight by default
-        * @param TUint32 aSelected The UID of the AP selected by the user
-        * @return The accomplished task's flag-codes:
-        * <br>
-        * KApUiEventNone,
-        * <br>
-        * KApUiEventSelected,
-        * <br>
-        * KApUiEventCreatedBlank,
-        * <br>
-        * KApUiEventCreatedUsedOld,
-        * <br>
-        * KApUiEventEdited,
-        * <br>
-        * KApUiEventDeleted
-        * <br>
-        * and their combinations. ( Bitwise OR )
-        * <br>
-        * aSelected will be modified only if KApUiEventSelected is included
-        * in the flags.
-        * <br>
-        * Returns after completion!
-        */
-        void DoRunSetPageSettingsL( TUint32 aHighLight, TUint32& aSelected );
-
-
-        /**
-        * handles the Create new access Point by using existing one command.
-        * Called after user has selected the AP to copy
-        * Creates the new Ap and offers it for editing.
-        * @param aSelected The UID of the AP to copy. Shall not be KErrNone.
-        * @return The UID of the newly created Ap
-        */
-        TUint32 DoHandleApUseOldNewL( TUint32 aSelected );
-
-        /**
-        * Selects the Ap to Copy, returns its UID.
-        * If not selected, KErrNone is returned
-        */
-        TUint32 SelectApToCopyL();
-
-
-        /**
-        * handles the Create blank new access Point command.
-        */
-        TUint32 DoHandleApBlankNewL( TInt aBearers, TInt aIsps );
-
-
-        /**
-        * handles the Delete network group command.
-        * @param aUid The uid of the network to delete
-        */
-        void HandleNetworkDeleteCmdL( TUint32 aUid );
-
-
-        /**
-        * Gets the local variant value 
-        * @return A TInt stating the variant
-        */
-        TInt GetVariantL();
-
-
-        /**
-        * Gets confirmation about deleting an access point
-        * @param aUid A TUint32 holding the WAP access point ID of the 
-        * access point to be deleted.
-        * @param aIsLast A TBool specifying whether the access point to be 
-        * deleted is the last one or not.
-        * @return A TInt stating the result
-        */
-        TInt ConfirmDeleteL( TUint32 aUid, TBool aIsLast );
-
-
-        /**
-        * Wrapper for the public API
-        */
-        void HandleRunSettingsL( TUint32 aHighLight, TUint32& aSelected );
-        
-
-    protected:  // Functions from base classes
-
-        friend class CApSettingsDlg;
-        friend class CApSelectorDialog;
-        friend class CApSelPopupList;
-        friend class CApNetSelPopupList;
-        friend class CApSettingsHandler;
-
-    private:
-        /**
-        * Selects an appropriate bearer type for a given item according to 
-        * the current filtering criterias
-        * @param aBearers The current bearer filter set
-        * @param aItem The CApAccessPointItem whoose bearer type is to be set.
-        */
-        void ChooseBearerTypeL( TInt aBearers, CApAccessPointItem& aItem );
-
-        /**
-        * Duplciates an existing access point identified by the passed WAP ID
-        * @param aUid The WAP Access Point ID of the access point to duplicate
-        * @return The WAP Access Point ID of the newly created access point.
-        */
-        TUint32 HandleDuplicateL( TUint32 aUid );
-
-        
-        
-public:        
-        TUint32 EventStore() { return iEventStore; };
-        
-        
-            
-
-    private: //data
-        TBool                   iStartWithSelection;
-        TSelectionListType      iListType;
-        TSelectionMenuType      iSelMenuType;
- 
-        TInt                    iIspFilter;
-        TInt                    iBearerFilter;
-        TApSetHandlerImplExtra* iExt;           // Extra data holder structure
-
-        TInt                    iReqIpvType;    // Default is IPv4
-
-        CApSettingsModel*       iModel;
-        CTextOverrides*         iTextOverrides;
-        TUint32                 iEventStore;    // to hold the events
-        TUid                    iHelpMajor;
-        TBool                   iNoEdit;
-
-#ifdef __TEST_OOMDEBUG
-        TBool                           iMemTestOn;
-#endif // __TEST_OOMDEBUG
-
-    };
-
-#endif
-
-// End of File
--- a/apengine/apsettingshandlerui/inc/FeatureManagerWrapper.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,70 +0,0 @@
-/*
-* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of class CFeatureManagerWrapper.
-*
-*/
-
-
-#ifndef FEATURE_MANAGER_WRAPPER_H
-#define FEATURE_MANAGER_WRAPPER_H
-
-// INCLUDE FILES
-#include    <e32base.h>        //CBase
-#include    <featmgr.h>
-
-// CLASS DECLARATION
-
-/**
-* CFeatureManagerWrapper wraps FeatureManager to eliminate 
-* maintenance of existance of FeatureManager.
-*/
-NONSHARABLE_CLASS( CFeatureManagerWrapper ) :  public CBase
-    {  
-   
-   public:
-
-       /**
-       * Destructor. Uninitalize FeatureManager.
-       */
-       virtual ~CFeatureManagerWrapper();
-    
-       /**
-       * Static constructor.
-       */
-       static CFeatureManagerWrapper* NewL();        
-        
-   protected:
-
-       /**
-       * Default constructor.
-       */
-       CFeatureManagerWrapper();
-
-       /**
-       * Second-phase constructor. Initialize FeatureManager
-       */
-       void ConstructL();
-   
-   private:
-
-       /**
-       * Indicates Featuremanger is initialized or not.
-       */
-       TBool iIsFeatureMgrInitialized; 
-    
-    };
-
-#endif
-
-// End of file
--- a/apengine/apsettingshandlerui/inc/TextOverrides.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,124 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declares the CTextOverrides class.
-*
-*/
-
-
-#ifndef TEXT_OVERRIDES_H
-#define TEXT_OVERRIDES_H
-
-
-// INCLUDES
-#include <e32base.h>
-#include <commdb.h>
-
-#include <ApSettingsHandlerCommons.h>
-
-// CONST
-const TInt  KTxtOverrideGran   = KTTextIdMax+1;
-
-
-// CLASS DECLARATION
-/**
-* CTextOverrides class: It is a helper class for the Access Point settings.
-*
-*/
-NONSHARABLE_CLASS( CTextOverrides ) : public CBase
-    {
-
-    public: // Constructors and destructor
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @return The constructed CTextOverrides.
-        */
-        static CTextOverrides* NewL();
-
-
-        /**
-        * Destructor.
-        */
-        ~CTextOverrides();
-
-
-    protected:
-        /**
-        * Constructor.
-        */
-        CTextOverrides();
-
-
-        /**
-        * Second-phase constructor.
-        */
-        void ConstructL();
-
-
-
-    public: // New functions
-        /**
-        * Sets possible overrides of some texts.
-        * By default, text is read from resources. This provides a way to 
-        * change some of the text to a caller-supplied one. The text must 
-        * be read from resource and must be already localized.
-        * More than one text can be substituted, they are stored internally 
-        * in an array.
-        * @param aText2Change TTextID to identify the text to be replaced with
-        * @param aNewText Reference to the substitute text.
-        */
-        void SetTextOverrideL( TTextID aText2Change, const TDesC& aNewText );
-
-
-        /**
-        * Gets overrides of the given text.
-        * By default, text is read from resources. This provides a way to 
-        * change some of the text to a caller-supplied one. The text must 
-        * be read from resource and must be already localized.
-        * More than one text can be substituted, they are stored internally 
-        * in an array.
-        * @param aTextId TTextID type to identify the text to get
-        * @return Reference to the overriding text.
-        */
-        const TDesC& TextOverrideL( TTextID aTextId );
-
-        /**
-        * Checks whether a given text is overriden or not.
-        * By default, text is read from resources. This provides a way to 
-        * change some of the text to a caller-supplied one. The text must 
-        * be read from resource and must be already localized.
-        * More than one text can be substituted, they are stored internally
-        * in an array.
-        * @param aTextId TTextID type to identify the text to check
-        * @return Boolean indicatiing whether the given text is 
-        * overriden or not.
-        */
-        TBool IsTextOverridenL( TTextID aTextId );
-
-        /*
-        * Validates the passed ID. If invalid, leaves with KErrInvalidTextId
-        * @param aTextId The text ID to validate
-        */
-        void ValidateIdL( TTextID aTextId );
-
-    private: //data
-        CArrayPtrFlat<HBufC>*   iTxtArray;
-
-    };
-
-#endif
-
-// End of File
--- a/apengine/apsettingshandlerui/inc/apsettingsui.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,257 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declares the main handler, CApSettingsHandler and public API for the 
-*     Access Point settings.
-*
-*/
-
-
-#ifndef APSETTINGS_UI_H
-#define APSETTINGS_UI_H
-
-// INCLUDES
-#include <ApSettingsHandlerCommons.h>
-#include <ApEngineConsts.h>
-#include <ApSelect.h>
-
-// CONSTANTS
-
-
-// FORWARD DECLARATIONS
-class CActiveApDb;
-class CTextOverrides;
-
-class CApSettingsHandlerImpl;
-
-// CLASS DECLARATION
-/**
-* CApSettingsUi class: It is the main handler for the Access Point 
-* settings. It contains the only public API for other (sub)systems.
-*
-*/
-class CApSettingsUi : public CBase
-    {
-
-    public: // Constructors and destructor
-
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object.It is customizable through the
-        * parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create access 
-        * points. It has two main parts, Select and Edit. The first parameter, 
-        * aStartWithSelection gives whether we would like to select or edit.
-        * In case of selection, there is the possibility to use this module in
-        * many applications. For this, two layouts are implemented, one is 
-        * list pane used by General Settings which provides the list in a 
-        * list-pane. The other layout is for the other applications requiring 
-        * access point selection, a popup-list style as the decision was that 
-        * General Settings will use list-pane and all other apps. popup-list 
-        * style. It is the caller who selects the style so if spec. says 
-        * otherwise, this module still can be used.
-        * It is also possible to start the UI without selection, so if any 
-        * module has a 'linked/default/etc.' access point and stored it's UID,
-        * the module can simply call the editor part of the UI without having
-        * to select the AP once more.
-        * In case of editing only, (aStartWithSelection is EFalse), all other 
-        * construction parameters are ignored and after construction caller 
-        * can simply call DoRunSettingsL(..).
-        * In case of selection, a lot of other parameters can be specified to
-        * fulfil all requirements. There are three types of Options menu 
-        * available: EApSettingsSelMenuNormal, EApSettingsSelMenuSelectOnly,
-        * EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly: Only Select is visible, no way to edit,
-        *   delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:Options menu specified in General Settings,
-        *   contains Edit, Delete, Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal: Same as in EApSettingsSelMenuNormal 
-        *   BUT the first item is Select. This one makes it possible to select 
-        *   an access point and also possible to edit, create, delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering 
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly: Filter allows only access points that are 
-        *   capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly: Filter allows only access points that are 
-        *   capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP: Filter allows only access points that are 
-        *   capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory: Filter allows only access points that are 
-        *   capable of WAP access AND contain mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll: No filtering is done for the isp-type, all types of
-        *   access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the 
-        * values, filtering will be done in such a way that only access points 
-        * with the listed ISP-types will be shown.
-        * Second filtering possibility (aBearerFilter) is the desired bearer 
-        * type. The possible values are the values of the TApBearerType enum 
-        * type and their combinations, as in case of the ISP type.
-        * The ordering of the list can be specified with the aSortType 
-        * parameter. It can have the following values:
-        * KEApSortUidAscending: The sorting is done according to the ID of 
-        *   the access points in ascending order.
-        * KEApSortUidDescending: The sorting is done according to the ID of 
-        *   the access points in descending order.
-        * KEApSortNameAscending: The sorting is done according to the name of 
-        *   the access points in ascending order.
-        * KEApSortNameDescending: The sorting is done according to the name of 
-        *   the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        * @return The constructed CApSettingsUi object.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApSettingsUi* NewLC(
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType,
-                        TInt aReqIpvType,
-                        TVpnFilterType aVpnFilterType );
-
-
-        /**
-        * Destructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C ~CApSettingsUi();
-
-
-    protected:
-
-        /**
-        * Constructor.
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aNeedIpv6Support Whether IPv6 is supported or not
-        */
-        CApSettingsUi( TBool aStartWithSelection,
-                       TSelectionListType aListType,
-                       TSelectionMenuType aSelMenuType,
-                       TBool aNeedIpv6Support );
-
-
-
-        /**
-        * Second-phase constructor.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL(
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType,
-                                TVpnFilterType aVpnFilterType
-                                );
-
-
-    public: // New functions
-
-        /**
-        * Starts the settings component.
-        * Creates dialog(s) from scratch, launches and executes them.
-        * Can leave with error codes.
-        * @param TUint32 aHighlight The UID of the AP to highlight by default
-        * @param TUint32 aSelected The UID of the access point selected 
-        * by the user.
-        * @return The accomplished task's flag-codes:
-        * <br>
-        * KApUiEventNone,
-        * <br>
-        * KApUiEventSelected,
-        * <br>
-        * KApUiEventCreatedBlank,
-        * <br>
-        * KApUiEventCreatedUsedOld,
-        * <br>
-        * KApUiEventEdited,
-        * <br>
-        * KApUiEventDeleted,
-        * <br>
-        * KApUiEventExitRequested
-        * <br>and their combinations. ( Bitwise OR )
-        * <br>
-        * aSelected will be modified only if KApUiEventSelected is included 
-        * in the flags.
-        * <br>
-        * In case it returns KApUiEventExitRequested, the user had choosen
-        * the Exit option from the Options menu which means
-        * that the caller application MUST exit!
-        * <br>
-        * Returns after completion!
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt RunSettingsL( TUint32 aHighLight, TUint32& aSelected );
-
-
-    private: //data
-        TBool                   iStartWithSelection;
-        TSelectionListType      iListType;
-        TSelectionMenuType      iSelMenuType;
-
-        TInt                    iReqIpvType;    // Default is IPv4
-
-        CApSettingsHandlerImpl* iImpl;          // owned
-        
-
-    };
-
-#endif
-
-// End of File
--- a/apengine/apsettingshandlerui/loc/apsettingshandlerui.loc	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1195 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     This is a localisation file for ApSettingsHandlerUi
-*     A .loc file is the one and only place where the logical strings
-*     to be localised are defined.
-*
-*/
-
-
-
-// LOCALISATION STRINGS
-
-
-//d:Command in options menu.
-//d:Selects the currently selected access point.
-//l:list_single_pane_t1_cp2
-//w:
-//r:2.8
-//
-#define qtn_set_cmd_select "Select"
-
-
-//d:Command in options menu.
-//d:Opens the currently selected access point.
-//l:list_single_pane_t1_cp2
-//w:
-//r:2.8
-//
-#define qtn_set_cmd_edit_ap "Edit"
-
-
-
-//d:Command in options menu.
-//d:Create new access point top menu.
-//l:list_single_pane_t1_cp2
-//w:
-//r:2.8
-//
-#define qtn_set_cmd_new_ap "New access point"
-
-
-//d:Sub-command in options menu's qtn_set_cmd_new_ap.
-//d:Create new access point with default values.
-//l:list_single_popup_submenu_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_cmd_new_default "Default settings"
-
-
-//d:Sub-command in options menu's qtn_set_cmd_new_ap.
-//d:Create access point based on an existing one.
-//l:list_single_popup_submenu_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_cmd_new_existing "Use existing"
-
-
-
-//d:Command in options menu.
-//d:Deletes the currently selected access point.
-//l:list_single_pane_t1_cp2
-//w:
-//r:2.8
-//
-#define qtn_set_cmd_del_ap "Delete"
-
-
-//d:Command in options menu.
-//d:Opens help application with context sensitive help.
-//l:list_single_pane_t1_cp2
-//w:
-//r:2.8
-//
-#define qtn_set_options_help "Help"
-
-
-//d:Command in options menu.
-//d:Exits access point settings.
-//l:list_single_pane_t1_cp2
-//w:
-//r:2.8
-//
-#define qtn_set_options_exit "Exit"
-
-
-
-
-
-
-
-
-
-
-
-//d:Title pane text while in General settings' connection settings.
-//l:title_pane_t2/opt9
-//w:
-//r:2.8
-//
-#define qtn_set_title_settings_inet "Connection settings"
-
-
-
-//d:Title pane text while in General settings' connection settings.
-//l:title_pane_t2/opt9
-//w:
-//r:2.8
-//
-#define qtn_set_navi_ap "Access points"
-
-
-
-
-//d:User has tried to edit active access point.
-//d:Operation is refused with this info note.
-//l:popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_set_note_ap_in_use_edit "Access point in use: Can't be edited."
-
-
-//d:User has tried to delete active access point.
-//d:Operation is refused with this info note.
-//l:popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_set_note_ap_in_use_del "Access point in use: Can't be deleted."
-
-
-
-//d:User trying to delete last access point.
-//d:Operation is confirmed with this info note.
-//d:%U stands for the name of the connection.
-//l:popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_set_note_delete_last_ap "%U connection is the only one. Are you sure to delete it?"
-
-
-
-//d:User enters access points list view and no connections exists.
-//d:User is offered a 'solution' with this info note.
-//l:popup_note_window
-//w:
-//r:3.1
-//
-#define qtn_set_ap_create_new "No access points defined. Define now?"
-
-
-//d:User trying to delete access point which is linked to any other application.
-//d:Operation is confirmed with this info note.
-//l:popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_set_ap_delete_linked "Access point linked to another application.Are you sure to delete?"
-
-
-
-//d:User steps back from access point editing while Access Number field for data call is still empty.
-//d:Operation is confirmed with this confirmation query.
-//l:popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_set_ap_access_number_not "Access point can't\n be saved without \naccess number.\nDelete it?"
-
-
-
-
-
-
-
-//d:Command in options menu in access points view.
-//d:Modifies the currently selected access point.
-//l:list_single_pane_t1_cp2
-//w:
-//r:2.8
-//
-#define qtn_set_options_change "Change"
-
-
-//d:Command in options menu in access points view.
-//d:Opens advanced settings for the access point.
-//l:list_single_pane_t1_cp2
-//w:
-//r:2.8
-//
-#define qtn_set_options_ap_advanced "Advanced settings"
-
-
-
-
-
-// localisation info for the access point setting view/edit part
-// all strings below are items for list_setting_item
-//
-// "Common" for all access point bearer types
-
-//d:Item text in setting list.
-//d:The name of the connection
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_ap_conn_name "Connection name"
-
-
-//d:Item text in setting list.
-//d:The name of the bearer type.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_ap_bearer "Bearer type"
-
-
-//d:Item text in setting list.
-//d:Indicates whether connection is secure/unsecure (result: On/Off)
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_wtls_security "WTLS security"
-
-
-//d:Item text in setting list.
-//d:Indicates whether the connection type is continuous or temporary
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_conn_type "Connection type"
-
-
-// for GPRS bearer
-//d:Item text in setting list.
-//d:The name of the GPRS access point
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_access_point_name "Access point name"
-
-
-//d:Item text in setting list.
-//d:The user name
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_ap_username "User name"
-
-
-//d:Item text in setting list.
-//d:Prompt password? (Yes/No)
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_prompt_passwd "Prompt password"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_ap_passwd "Password"
-
-
-//d:Item text in setting list.
-//d:Indicates whther password authentication is secure or normal
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_passwd_aut "Password authentication"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_gateway_ip "Wap Gateway IP address"
-
-
-//d:Item text in setting list.
-//d:The starting page for this access point.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_starting_page "Starting page"
-
-
-// for GPRS Advanced
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_ip_address "Phone IP address"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_primary_dns "Primary Name Server"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_secondary_dns "Secondary Name Server"
-
-
-
-// for CSD
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_access_number "Access Number"
-
-
-//d:Item text in setting list.
-//d:Indicates whether data call is analogue or ISDN
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_data_call_type "Data call type"
-
-
-//d:Item text in setting list.
-//d:The max. connection speed
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_max_speed "Max. connection speed"
-
-
-// for CSD Advanced
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_use_cb "Use call back"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_cb_type "Call back type"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_cb_number "Call back number"
-
-
-//d:Item text in setting list.
-//d:Indicates whether to use PPP compression or not
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_ppp_comp "Enable PPP compression"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_use_logins "Use login script"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_modem_init_string "Modem init string"
-
-
-// 'Textual' but fixed values for settings
-
-//d:The bearer type is packet data
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_bearer_packet_data "Packet data"
-
-//d:The bearer type is data call
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_bearer_data_call "Data call"
-
-
-//d:The bearer type is HSCSD data call
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_netw_sett_bearer_hscsd "HSCSD call"
-
-
-//d:Answer to: Prompt for password?
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_prompt_passwd_yes "Yes"
-
-
-//d:Answer to: Prompt for password?
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_prompt_passwd_no "No"
-
-
-//d:Answer to: qtn_set_passwd_aut,
-//d:whether password authentication is secure or normal
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_passwd_aut_normal "Normal"
-
-
-//d:Answer to: qtn_set_passwd_aut,
-//d:whether password authentication is secure or normal
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_passwd_aut_secure "Secure"
-
-
-//d:The IP address is dynamic.
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_ip_address_dynamic "Dynamic"
-
-
-//d:Answer to: qtn_set_wtls_security
-//d:whether connection is secured or not
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_wtls_security_on "On"
-
-
-//d:Answer to: qtn_set_wtls_security
-//d:whether connection is secured or not
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_wtls_security_off "Off"
-
-
-//d:Answer to: qtn_set_conn_type
-//d:connection type is continuous
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_conn_type_contin "Continuous"
-
-
-//d:Answer to: qtn_set_conn_type
-//d:connection type is temporary
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_conn_type_temp "Temporary"
-
-
-//d:Answer to: qtn_set_data_call_type
-//d:The data call type is analogue
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_data_call_analolgue "Analogue"
-
-
-//d:Answer to: qtn_set_data_call_type
-//d:The data call type is ISDN v.110
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_data_call_isdn_110 "ISDN v.110"
-
-
-//d:Answer to: qtn_set_data_call_type
-//d:The data call type is ISDN v.120
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_data_call_isdn_120 "ISDN v.120"
-
-
-//d:Answer to: qtn_set_max_speed
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_speed_auto_detect "Auto detect"
-
-
-//d:Answer to: qtn_set_use_cb
-//d: Use call back.
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_use_cb_yes "Yes"
-
-
-//d:Answer to: qtn_set_use_cb
-//d:Do not use call back.
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_use_cb_no "No"
-
-
-//d:Answer to: qtn_set_cb_type
-//d:Use server number for call back.
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_use_server_number "Use server number"
-
-
-//d:Answer to: qtn_set_cb_type
-//d:Use other number for call back.
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_use_other_number "Use other number"
-
-
-//d:Answer to: qtn_set_ppp_comp
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_ppp_comp_yes "Yes"
-
-
-//d:Answer to: qtn_set_ppp_comp
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_ppp_comp_no "No"
-
-
-//d:Answer to: qtn_set_use_logins
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_use_logins_no "no"
-
-
-//d:Answer to: qtn_set_use_logins
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_use_logins_yes "yes"
-
-
-//d:Prompt text when creating new access point based on an already existing value
-//l:heading_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_new_ap_prompt_list "Use existing connection:"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_login_script "Login script"
-
-
-
-//d:Text used as prompt text in a text setting item
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_default_ap "Default Access Point"
-
-
-
-// not part of spec but added it
-//d:After editing an access point, info after succesful save
-//l:popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_set_ap_saved "Saved"
-
-
-// not part of spec but added it
-//d:User IS in access points list view and no connections exists.
-//d:User is informed of having 0 access points with this 'empty list text'.
-//l:main_list_empty_pane
-//w:
-//r:2.8
-//
-#define qtn_set_ap_none_defined "No access point connections defined."
-
-
-
-//d:When a compulsory setting is not filled, this string indicates that it is compulsory.
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_compulsory "Compulsory"
-
-
-
-//d:When no access point is selected, the text None indicates this.
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_mce_settings_mms_none "None"
-
-
-//d: When the entered phonennumber is invalid, this information note is shown
-//l: popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_info_invalid_number "Invalid number"
-
-
-//d: When the entered connection name is invalid, this information note is shown
-//l: popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_info_invalid_conn_name "Invalid connection name"
-
-
-//d:%U stands for the name of the connection.
-//l: popup_note_wait_window
-//w:
-//r:2.8
-//
-#define qtn_set_wait_deleting_ap "Deleting %U"
-
-
-
-//d:Error note message: database is inaccessible.
-//l:popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_set_err_db_inaccessible    "Cannot access\ndatabase.\nTry again later."
-
-
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_proxy_server_address "Proxy server address"
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_proxy_port_number "Port Number"
-
-
-
-//d:Item text in setting list.
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_network_group "Network group"
-
-
-
-//d:Command in options menu.
-//d:Creates a new network group.
-//l:list_single_pane_t1_cp2
-//w:
-//r:2.8
-//
-#define qtn_set_cmd_new_netw_group "Create new group"
-
-
-
-//d:When there is no homepage value set, it is indicated with the text: none 
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_home_page_none "None"
-
-
-//d:If user selected a  WCDMA specific speed, this string presented to confirm it.
-//l:popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_set_conf_max_speed_only_3g "Selected speed is available only in third generation mobile network. Continue?"
-
-
-//d:Item text in setting list. Gives the network type (whether it is IP4 or IP6)
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define  qtn_set_network_type "Network type"
- 
-
-//d: States that the network type is IP4
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_nw_type_ipv4 "IPv4"
-
-
-//d: States that the network type is IP6
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_nw_type_ipv6 "IPv6"
-
-
-//d:Item text in setting list. Offers IPv4 settings to be changed
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define  qtn_set_ipv4_settings "IPv4 settings"
-
-
-//d:Item text in setting list. Offers IPv6 settings to be changed
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define  qtn_set_ipv6_settings "IPv6 settings"
-
-
-//d:Item text in setting list. Entrance for the Domain name servers settings
-//l:list_setting_pane_t1
-//w:
-//r:2.8
-//
-#define  qtn_set_dns_servers_ip "Domain name servers"
-
-
-//d: When the entered IP address is not a valid IP address, this error note is shown
-//l: popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_set_info_invalid_ip "Invalid IP address"
-
-
-//d: Name server IP address is user defined
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_ip_user_defined "User defined"
-
-
-//d: Name server IP address is well-known
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-//
-#define qtn_set_ip_well_known "Well-known"
-
-
-
-//d:If user selected a  VPN access point for editing, this string presented to inform the user that 
-// to edit a VPN access point, he/she must use the VPN Settings UI
-//l:popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_set_note_vpn_ap_sett "VPN access point, use VPN settings to edit it."
-
-
-//d:User has tried to delete a protected access point.
-//d:Operation is refused with this info note.
-//l:popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_set_note_protected_ap "Protected Access point: Can’t be deleted"
-
-
-//d:User has tried to open a protected access point.
-//d:Operation is refused with this info note.
-//l:popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_set_note_protected_ap_sett  "Protected setting: Can’t be opened"
-
-
-//d:User trying to delete access point, which is linked to an existing another VPN access point.
-//d:Operation is confirmed with this info note.
-//d:%U stands for the name of the VPN connection.
-//l:popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_vpn_quest_delete_iap_associated "Access point is associated with a VPN access point ’%U’. Delete anyway?"
-
-
-//d:User trying to copy a protected access point
-//d:Operation is denied with this info note.
-//l:popup_note_window
-//w:
-//r:2.8
-//
-#define qtn_netw_info_cannot_use_protected_ap "Unable to use protected access point"
-
-
-
-
-//d:User name if left empty
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-#define qtn_set_ap_username_none "None"
-
-
-//d:Domain name servers 'Automatic'
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-#define qtn_set_dns_servers_automatic "Automatic"
-
-
-//d:Primary name server & Secondary name server value 'Automatic' if left empty
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-#define qtn_set_dns_server_automatic "Automatic"
-
-
-//d:Text to be displayed when proxy server address is left empty
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-#define qtn_set_proxy_server_address_none "None"
-
-
-//d:Text to be displayed when the callback number is left empty
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-#define qtn_set_cb_number_none "None"
-
-
-//d:Text to be displayed when the login script number is left empty
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-#define qtn_set_login_script_none "None"
-
-
-//d:Text to be displayed when the modem init string is left empty
-//l:list_set_graphic_pane_t1
-//w:
-//r:2.8
-#define qtn_set_modem_init_none "None"
-
-
-
-
-
-
-// WLAN loc strings
-
-
-
-//d:The bearer type is Wireless LAN
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_bearer_wlan "Wireless LAN"
-
-
-//d:Item text in setting list.
-//d:The WLAN network name
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_network_name "WLAN network name"
-
-
-//d:Defines the WLAN network mode, i.e. either infrastructure or ad-hoc.
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_network_mode "WLAN network mode"
-
-
-//d:Defines the WLAN security mode, i.e. Open, WEP, 802.1x, WPA.
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_security_mode "WLAN security mode"
-
-
-
-//d:Selecting it will open the WLAN security settings
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_security_settings "WLAN security settings"
-
-
-//d:Specifies that the network mode is Infrastructure
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_network_mode_infra "Infrastructure"
-
-
-//d:Specifies that the network mode is Ad-hoc
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_network_mode_adhoc "Ad-hoc"
-
-
-//d:Specifies that the security mode is Open network
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_security_mode_open "Open network"
-
-
-//d:Specifies that the security mode is WEP
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_security_mode_wep "WEP"
-
-
-//d:Specifies that the security mode is 802.1x
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_security_mode_802_1x "802.1x"
-
-
-//d:Specifies that the security mode is WPA
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_security_mode_wpa "WPA/WPA2"
-
-
-//d:Specifies that the WLAN network name is user defined
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_network_name_user_defined "User defined"
-
-
-//d:Specifies that the WLAN network name is selected from a scanned list
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_network_name_scan "Scan for networks"
-
-
-
-//d:User has tried to save incomplete WLAN access point.
-//d:Operation is refused with this info note.
-//l:popup_note_window
-//w:
-//r:3.0
-//
-#define qtn_wlan_quest_nw_name_not_defined "Incomplete details. WLAN network name must be defined.Delete access point?"
-
-
-
-//d:Defines the WLAN subnet mask to be used
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_netw_sett_subnet_mask "Subnet mask"
-
-
-//d:Defines the WLAN default gateway to be used
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_netw_sett_default_gateway "Default gateway"
-
-
-
-//d:Informs that the selected Open Network does not has security settings.
-//l:popup_note_window
-//w:
-//r:3.0
-//
-#define qtn_wlan_info_no_security_settings "No security settings for ’Open network’"
-
-
-//d:Prompt text for WLAN network name query.
-//l:heading_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_prmpt_network_name "WLAN network name:"
-
-
-//d:User tries to save an access point which has some compulsory fields which are not filled.
-//d:Operation is confirmed with this confirmation query.
-//l:popup_note_window
-//w:
-//r:3.0
-//
-#define qtn_netw_quest_iap_incomplete_delete "Incomplete access point details. Exit without saving?"
-
-
-
-//d:Prompt text for Ad-hoc channel name query.
-//l:popup_query_data_window
-//w:
-//r:3.0
-//
-#define qtn_wlan_prmpt_adhoc_channel "Ad-hoc channel"
-
-
-//d:Setting item text for Ad-hoc channel.
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_adhoc_channel "Ad-hoc channel"
-
-
-//d:Defines the ad-hoc channel to be automatic
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_adhoc_channel_automatic "Automatic"
-
-
-//d:Defines the ad-hoc channel to be user defined
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_adhoc_channel_user_defined "User defined"
-
-
-//d:User steps back from access point editing while the securuty settings' compulsory fields are not filled.
-//d:Operation is confirmed with this confirmation query.
-//l:popup_note_window
-//w:
-//r:3.0
-//
-#define qtn_wlan_quest_security_settings_empty "Security settings for the selected security mode are incomplete.\nDelete access point?"
-
-
-///d:Item text in setting list "Hidden network"
-//l:list_setting_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_hidden_network "Hidden network"
-
-
-//d:Option of hidden network
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_hidden_network_no "No"
-
-
-//d:Option of hidden network
-//l:list_set_graphic_pane_t1
-//w:
-//r:3.0
-//
-#define qtn_wlan_sett_hidden_network_yes "Yes"
-
-
-//d:User is duplicating an access point.
-//d:Options menu item.
-//l:list_single_pane_t1_cp2
-//w:
-//r:3.1
-//
-#define qtn_netw_options_duplicate_iap "Duplicate"
-
-
-//d:User enters access points list view and no connections exists.
-//d:User is informed about it and a 'solution' is offered with this info note.
-//l:popup_note_window
-//w:
-//r:3.1
-//
-#define qtn_netw_info_no_iap_defined "No access points defined. Define one via Connection settings."
-
-
-// End of File
--- a/apengine/apsettingshandlerui/src/AccessPointTextSettingPage.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Implementation of CAccessPointTextSettingPage.
-*
-*/
-
-
-// INCLUDE FILES
-
-
-#include "AccessPointTextSettingPage.h"
-#include <akntextsettingpage.h>
-
-#include <AknInputLanguageInfo.h>  // for AVKON ELAF
-#include <featmgr.h>
-#include "ApSettingsHandlerLogger.h"
-
-// ================= MEMBER FUNCTIONS =======================
-
-
-// ---------------------------------------------------------
-// CAccessPointTextSettingPage::CAccessPointTextSettingPage
-// ---------------------------------------------------------
-//
-CAccessPointTextSettingPage::CAccessPointTextSettingPage
-                                        ( TInt aResourceID,
-                                          TDes& aText,
-                                          TInt aTextSettingPageFlags,
-                                          TBool aIsLatin )
-    :CAknTextSettingPage( aResourceID, aText, aTextSettingPageFlags )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CAccessPointTextSettingPage::CAccessPointTextSettingPage
-// ---------------------------------------------------------
-//
-CAccessPointTextSettingPage::CAccessPointTextSettingPage
-                                    ( const TDesC* aSettingTitleText,
-                                      TInt aSettingNumber,
-                                      TInt aControlType,
-                                      TInt aEditorResourceId,
-                                      TInt aSettingPageResourceId,
-                                      TDes& aText,
-                                      TInt aTextSettingPageFlags,
-                                      TBool aIsLatin )
-    :CAknTextSettingPage( aSettingTitleText, aSettingNumber, aControlType,
-    aEditorResourceId, aSettingPageResourceId, aText, aTextSettingPageFlags )
-    {
-    }
-
-// ---------------------------------------------------------
-// CAccessPointTextSettingPage::ConstructL
-// ---------------------------------------------------------
-//
-void CAccessPointTextSettingPage::ConstructL()
-    {
-    }
-
-// End of File
--- a/apengine/apsettingshandlerui/src/ApMultiLineDataQueryDialog.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,59 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Implementation of CApMultiLineDataQueryDialog.
-*
-*/
-
-
-// INCLUDE FILES
-
-
-#include    "ApMultiLineDataQueryDialog.h"
-#include    "ApSettingsHandlerLogger.h"
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-
-// ---------------------------------------------------------
-// CApMultiLineDataQueryDialog::NewL
-// ---------------------------------------------------------
-//
-CApMultiLineDataQueryDialog* CApMultiLineDataQueryDialog::NewL(
-                           TDes&  aText1, TDes&  aText2,
-                           TTone aTone )
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CApMultiLineDataQueryDialog::CApMultiLineDataQueryDialog
-// ---------------------------------------------------------
-//
-CApMultiLineDataQueryDialog::CApMultiLineDataQueryDialog( const TTone& aTone )
-: CAknMultiLineDataQueryDialog( aTone )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApMultiLineDataQueryDialog::UpdateLeftSoftKeyL
-// ---------------------------------------------------------
-//
-void CApMultiLineDataQueryDialog::UpdateLeftSoftKeyL()
-    {
-    }
-
-// End of File
--- a/apengine/apsettingshandlerui/src/ApNetSelPopupList.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,251 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Defines CApNetSelPopupList for access point selection.
-*
-*/
-
-
-// INCLUDE FILES
-
-#include <ApNetworkItem.h>
-#include <featmgr.h>
-
-#include "ApSettingsHandlerUI.hrh"
- 
-
-#include "ApNetSelPopupList.h"
-#include "ApNetSelectorListBoxModel.h"
-#include "ApSettingsModel.h"
-#include <apsetui.rsg>
-#include "ApsettingshandleruiImpl.h"
-
-
-#include "ApSettingsHandlerLogger.h"
-
-#include "AccessPointTextSettingPage.h"
-
-
-
-#include <ApProtHandler.h>  // for protection of settings
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CApNetSelPopupList::NewL
-// ---------------------------------------------------------
-//
-CApNetSelPopupList* CApNetSelPopupList::NewL( CApSettingsModel& aModel,
-                                       CApSettingsHandlerImpl& aHandler,
-                                       TInt& aCurrentSelectionIndex,
-                                       TInt& aPreferredUid,
-                                       TUint32& aEventStore,
-                                       CDesCArrayFlat* aItemArray,
-                                       TBool aNeedsNone )
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CApNetSelPopupList::ConstructL
-// ---------------------------------------------------------
-//
-void CApNetSelPopupList::ConstructL()
-    {
-    }
-
-
-// Destructor
-CApNetSelPopupList::~CApNetSelPopupList()
-    {
-    }
-
-
-
-// Constructor
-CApNetSelPopupList::CApNetSelPopupList(
-                                 CApSettingsModel& aModel,
-                                 CApSettingsHandlerImpl& aHandler,
-                                 TInt& aIndex, TInt& aPreferredUid,
-                                 CDesCArrayFlat* aItemArray,
-                                 TUint32& aEventStore, TBool aNeedsNone
-                                 )
-:CAknRadioButtonSettingPage( R_POPUP_LIST_NETWORK_SETTING_PAGE, 
-                             aIndex, aItemArray ),
-iDataModel( &aModel ),
-iSelected( &aPreferredUid ),
-iHandler( &aHandler ),
-iEventStore( &aEventStore ),
-iNeedsNone( aNeedsNone ),
-iNeedUnlock( EFalse )
-    {
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApNetSelPopupList::SetHighlighted()
-// called when needs to change the highlighting
-// ---------------------------------------------------------
-//
-void CApNetSelPopupList::SetHighlighted()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApNetSelPopupList::GetHelpContext()
-// ---------------------------------------------------------
-//
-void CApNetSelPopupList::GetHelpContext(TCoeHelpContext& aContext) const
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApNetSelPopupList::HandleApDbEventL
-// called by the active access point framework
-// ---------------------------------------------------------
-//
-void CApNetSelPopupList::HandleApDbEventL( TEvent anEvent )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApNetSelPopupList::ActivateL()
-// called after the dialog is shown
-// used to handle empty list - query
-// ---------------------------------------------------------
-//
-void CApNetSelPopupList::ActivateL()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApNetSelPopupList::SelectCurrentItemL()
-// called after the setting had been changed
-// ---------------------------------------------------------
-//
-void CApNetSelPopupList::SelectCurrentItemL()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApNetSelPopupList::OkToExitL( TInt aButtonId )
-// called by framework when the OK button is pressed
-// ---------------------------------------------------------
-//
-TBool CApNetSelPopupList::OkToExitL( TInt aButtonId )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApNetSelPopupList::FillListBoxWithDataL()
-// called when listbox needs to be filled with data
-// ---------------------------------------------------------
-//
-void CApNetSelPopupList::FillListBoxWithDataL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApNetSelPopupList::SetSelectedL()
-// ---------------------------------------------------------
-//
-void CApNetSelPopupList::SetSelectedL()
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApNetSelPopupList::DynInitMenuPaneL
-// ---------------------------------------------------------
-//
-void CApNetSelPopupList::DynInitMenuPaneL( TInt aResourceId,
-                                        CEikMenuPane* aMenuPane )
-    {
-    }
-
-
-// From MEikCommandObserver
-// ---------------------------------------------------------
-// CApNetSelPopupList::ProcessCommandL
-// ---------------------------------------------------------
-//
-void CApNetSelPopupList::ProcessCommandL( TInt aCommandId )
-    {
-    }
-
-
-
-// From CCoeControl
-// ---------------------------------------------------------
-// CApNetSelPopupList::OfferKeyEventL
-// ---------------------------------------------------------
-//
-TKeyResponse CApNetSelPopupList::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                              TEventCode aType)
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// ---------------------------------------------------------
-// CApNetSelPopupList::Need2DeleteSelect
-// ---------------------------------------------------------
-//
-TBool CApNetSelPopupList::Need2DeleteSelect( TInt aResourceId )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApNetSelPopupList::Need2DeleteOpenDelete
-// ---------------------------------------------------------
-//
-TBool CApNetSelPopupList::Need2DeleteOpenDelete( TInt aResourceId )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApNetSelPopupList::HandleCreateNewNetworkGroupL
-// ---------------------------------------------------------
-//
-TBool CApNetSelPopupList::HandleCreateNewNetworkGroupL()
-    {
-    return EFalse;
-    }
-
-// End of File
--- a/apengine/apsettingshandlerui/src/ApNetSelectorListBoxModel.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,91 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Implementation of CApNetSelectorListboxModel.
-*
-*/
-
-
-// INCLUDE FILES
-#include "ApNetSelectorListBoxModel.h"
-#include "ApNetworkItem.h"
-#include <ApSettingsHandlerCommons.h>
-
-#include "ApSettingsHandlerLogger.h"
-
-// CONSTANTS
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CApNetSelectorListboxModel::CApNetSelectorListboxModel
-// ---------------------------------------------------------
-//
-CApNetSelectorListboxModel::CApNetSelectorListboxModel( )
-:CApNetworkItemList()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApNetSelectorListboxModel::~CApNetSelectorListboxModel
-// ---------------------------------------------------------
-//
-CApNetSelectorListboxModel::~CApNetSelectorListboxModel()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApNetSelectorListboxModel::MdcaCount
-// ---------------------------------------------------------
-//
-TInt CApNetSelectorListboxModel::MdcaCount() const
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CApNetSelectorListboxModel::MdcaPoint
-// ---------------------------------------------------------
-//
-TPtrC CApNetSelectorListboxModel::MdcaPoint( TInt aIndex ) const
-    {
-    User::Leave( KErrNotSupported );
-    return iBuf;
-    }
-
-
-// ---------------------------------------------------------
-// CApNetSelectorListboxModel::Item4Uid
-// ---------------------------------------------------------
-//
-TInt CApNetSelectorListboxModel::Item4Uid( TUint32 aUid, TInt& aErr ) const
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApNetSelectorListboxModel::FormatListboxText
-// ---------------------------------------------------------
-//
-void CApNetSelectorListboxModel::FormatListboxText( TInt aIndex,
-                                                TDes& aBuf ) const
-    {
-    }
-
-// End of File
--- a/apengine/apsettingshandlerui/src/ApSelPopupList.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,345 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Defines CApSelPopupList for access point selection.
-*
-*/
-
-
-// INCLUDE FILES
-#include "APSettingsHandlerUIVariant.hrh"
-
-#include <ApListItem.h>
-#include <apsetui.rsg>
-#include <featmgr.h>
-
-#include "ApSelectorListBoxModel.h"
-#include "ApSettingsModel.h"
-#include "ApSettingsHandlerUI.hrh"
-#include "ApSelPopupList.h"
-#include "ApsettingshandleruiImpl.h"
-
-
-#include "ApSettingsHandlerLogger.h"
-
-#include <ApProtHandler.h>  // for protection of settings
-
-#include <AknsUtils.h>
-#include <apsettings.mbg>
-#include <data_caging_path_literals.hrh>
-
-
-// CONSTANTS
-// Drive and file name of the MBM file containing icons for Protection
-_LIT( KFileIcons, "z:ApSettings.mbm" );
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CApSelPopupList::NewL
-// ---------------------------------------------------------
-//
-CApSelPopupList* CApSelPopupList::NewL( CApSettingsModel& aModel,
-                                       CApSettingsHandlerImpl& aHandler,
-                                       TInt& aCurrentSelectionIndex,
-                                       TInt& aPreferredUid,
-                                       TSelectionMenuType aSelMenuType,
-                                       TInt aIspFilter, TInt aBearerFilter,
-                                       TInt aSortType, TUint32& aEventStore,
-                                       CDesCArrayFlat* aItemArray,
-                                       TBool aNeedsNone,
-                                       TBool aNoEdit,
-                                       TInt aReqIpvType,
-                                       TVpnFilterType aVpnFilterType
-                                       )
-    {
-    return NULL;
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApSelPopupList::NewL
-// ---------------------------------------------------------
-//
-CApSelPopupList* CApSelPopupList::NewL( CApSettingsModel& aModel,
-                                       CApSettingsHandlerImpl& aHandler,
-                                       TInt& aCurrentSelectionIndex,
-                                       TInt& aPreferredUid,
-                                       TSelectionMenuType aSelMenuType,
-                                       TInt aIspFilter, TInt aBearerFilter,
-                                       TInt aSortType, TUint32& aEventStore,
-                                       CDesCArrayFlat* aItemArray,
-                                       TBool aNeedsNone,
-                                       TInt aReqIpvType,
-                                       TVpnFilterType aVpnFilterType,
-                                       TBool aIncludeEasyWlan,
-                                       TBool aNoEdit
-                                       )
-    {
-    return NULL;
-    }
-    
-    
-
-// ---------------------------------------------------------
-// CApSelPopupList::ConstructL
-// ---------------------------------------------------------
-//
-void CApSelPopupList::ConstructL()
-    {
-    }
-
-
-
-// Destructor
-CApSelPopupList::~CApSelPopupList()
-    {
-    }
-
-
-
-// Constructor
-CApSelPopupList::CApSelPopupList(
-                                 CApSettingsModel& aModel,
-                                 CApSettingsHandlerImpl& aHandler,
-                                 TInt& aIndex, TInt& aPreferredUid,
-                                 TSelectionMenuType aSelMenuType,
-                                 TInt aIspFilter, TInt aBearerFilter,
-                                 TInt aSortType, CDesCArrayFlat* aItemArray,
-                                 TUint32& aEventStore, TBool aNeedsNone,
-                                 TBool aNoEdit,
-                                 TInt aReqIpvType,
-                                 TVpnFilterType aVpnFilterType
-                                 )
-:CAknRadioButtonSettingPage( R_POPUP_LIST_SETTING_PAGE,
-                             aIndex, aItemArray ),
-iDataModel( &aModel ),
-iSelected( &aPreferredUid ),
-iBearerFilter( aBearerFilter ),
-iIspFilter( aIspFilter ),
-iSortType( aSortType ),
-iSelMenuType( aSelMenuType ),
-iHandler( &aHandler ),
-iEventStore( &aEventStore ),
-iPreferredUid( aPreferredUid ),
-iNeedsNone( aNeedsNone ),
-iNeedUnlock( EFalse ),
-iReqIpvType( aReqIpvType ),
-iVpnFilterType( aVpnFilterType ),
-iVariant( aHandler.iExt->iVariant ),
-iIncludeEasyWlan( EFalse ),
-iNoEdit( aNoEdit )
-    {
-    }
-
-
-
-
-CApSelPopupList::CApSelPopupList(
-                                 CApSettingsModel& aModel,
-                                 CApSettingsHandlerImpl& aHandler,
-                                 TInt& aIndex, TInt& aPreferredUid,
-                                 TSelectionMenuType aSelMenuType,
-                                 TInt aIspFilter, TInt aBearerFilter,
-                                 TInt aSortType, CDesCArrayFlat* aItemArray,
-                                 TUint32& aEventStore, TBool aNeedsNone,
-                                 TInt aReqIpvType,
-                                 TVpnFilterType aVpnFilterType,
-                                 TBool aIncludeEasyWlan,
-                                 TBool aNoEdit
-                                 )
-:CAknRadioButtonSettingPage( R_POPUP_LIST_SETTING_PAGE,
-                             aIndex, aItemArray ),
-iDataModel( &aModel ),
-iSelected( &aPreferredUid ),
-iBearerFilter( aBearerFilter ),
-iIspFilter( aIspFilter ),
-iSortType( aSortType ),
-iSelMenuType( aSelMenuType ),
-iHandler( &aHandler ),
-iEventStore( &aEventStore ),
-iPreferredUid( aPreferredUid ),
-iNeedsNone( aNeedsNone ),
-iNeedUnlock( EFalse ),
-iReqIpvType( aReqIpvType ),
-iVpnFilterType( aVpnFilterType ),
-iVariant( aHandler.iExt->iVariant ),
-iIncludeEasyWlan( aIncludeEasyWlan ),
-iInitialised( EFalse ),
-iNoEdit( aNoEdit )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSelPopupList::SetHighlighted()
-// called when needs to change the highlighting
-// ---------------------------------------------------------
-//
-void CApSelPopupList::SetHighlighted()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelPopupList::GetHelpContext()
-// ---------------------------------------------------------
-//
-void CApSelPopupList::GetHelpContext(TCoeHelpContext& aContext) const
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelPopupList::HandleApDbEventL
-// called by the active access point framework
-// ---------------------------------------------------------
-//
-void CApSelPopupList::HandleApDbEventL( TEvent anEvent )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelPopupList::ActivateL()
-// called after the dialog is shown
-// used to handle empty list - query
-// ---------------------------------------------------------
-//
-void CApSelPopupList::ActivateL()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelPopupList::SelectCurrentItemL()
-// called after the setting had been changed
-// ---------------------------------------------------------
-//
-void CApSelPopupList::SelectCurrentItemL()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelPopupList::OkToExitL( TInt aButtonId )
-// called by framework when the OK button is pressed
-// ---------------------------------------------------------
-//
-TBool CApSelPopupList::OkToExitL( TInt aButtonId )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelPopupList::FillListBoxWithDataL()
-// called when listbox needs to be filled with data
-// ---------------------------------------------------------
-//
-void CApSelPopupList::FillListBoxWithDataL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelPopupList::SetSelectedL()
-// ---------------------------------------------------------
-//
-void CApSelPopupList::SetSelectedL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelPopupList::CheckIfEmptyL()
-// ---------------------------------------------------------
-//
-void CApSelPopupList::CheckIfEmptyL()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelPopupList::DynInitMenuPaneL
-// ---------------------------------------------------------
-//
-void CApSelPopupList::DynInitMenuPaneL( TInt aResourceId,
-                                        CEikMenuPane* aMenuPane )
-    {
-    }
-
-
-// From MEikCommandObserver
-// ---------------------------------------------------------
-// CApSelPopupList::ProcessCommandL
-// ---------------------------------------------------------
-//
-void CApSelPopupList::ProcessCommandL( TInt aCommandId )
-    {
-    }
-
-
-    // From MEikListBoxObserver
-void CApSelPopupList::HandleListBoxEventL( CEikListBox* aListBox,
-                        MEikListBoxObserver::TListBoxEvent aEventType )
-    {
-    }
-
-
-// From CCoeControl
-// ---------------------------------------------------------
-// CApSelPopupList::OfferKeyEventL
-// ---------------------------------------------------------
-//
-TKeyResponse CApSelPopupList::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                              TEventCode aType)
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSelPopupList::LoadIconsL
-// ---------------------------------------------------------
-//
-TInt CApSelPopupList::LoadIconsL()
-    {
-    return 0;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSelPopupList::HandleResourceChange
-// ---------------------------------------------------------
-//
-void CApSelPopupList::HandleResourceChange(TInt aType)
-    {
-    }
-
-// End of File
--- a/apengine/apsettingshandlerui/src/ApSelQueryDialog.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,155 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Defines dialog CApSelQueryDialog for access point selection.
-*
-*/
-
-
-// INCLUDE FILES
-#include <aknlists.h>
-#include <ApListItem.h>
-#include <AknIconArray.h>
-#include <AknsUtils.h>
-
-#include <apsetui.rsg>
-#include <apsettings.mbg>
-
-#include <featmgr.h>
-
-#include "ApSelectorListBoxModel.h"
-#include "ApSettingsModel.h"
-#include "ApSettingsHandlerUI.hrh"
-#include "ApSelQueryDialog.h"
-
-
-#include "ApSettingsHandlerLogger.h"
-#include <data_caging_path_literals.hrh>
-
-// CONSTANTS
-// Drive and file name of the MBM file containing icons for Protection
-_LIT( KFileIcons, "z:ApSettings.mbm" );
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// Destructor
-CApSelQueryDialog::~CApSelQueryDialog()
-    {
-    }
-
-
-
-// Constructor
-CApSelQueryDialog::CApSelQueryDialog( CApSettingsModel& aModel,
-                                      TUint32* aIndex )
-:CAknListQueryDialog( (TInt*)aIndex ),
-iNeedUnlock( EFalse )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelQueryDialog::HandleApDbEventL
-// called by the active access point framework
-// ---------------------------------------------------------
-//
-void CApSelQueryDialog::HandleApDbEventL( TEvent anEvent )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSelQueryDialog::PostLayoutDynInitL();
-// called by framework before dialog is shown
-// ---------------------------------------------------------
-//
-void CApSelQueryDialog::PreLayoutDynInitL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelQueryDialog::PostLayoutDynInitL();
-// called by framework before dialog is shown
-// ---------------------------------------------------------
-//
-void CApSelQueryDialog::PostLayoutDynInitL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelQueryDialog::OkToExitL( TInt aButtonId )
-// called by framework when the OK button is pressed
-// ---------------------------------------------------------
-//
-TBool CApSelQueryDialog::OkToExitL( TInt aButtonId )
-    {
-    return EFalse;
-    }
-
-
-
-
-// From CCoeControl
-// ---------------------------------------------------------
-// CApSelQueryDialog::OfferKeyEventL
-// ---------------------------------------------------------
-//
-TKeyResponse CApSelQueryDialog::OfferKeyEventL( const TKeyEvent& aKeyEvent,
-                                              TEventCode aType)
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// From MEikCommandObserver
-// ---------------------------------------------------------
-// CApSelQueryDialog::ProcessCommandL
-// ---------------------------------------------------------
-//
-void CApSelQueryDialog::ProcessCommandL( TInt aCommandId )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelQueryDialog::FillListBoxWithDataL()
-// called when listbopx needs to be filled with data
-// ---------------------------------------------------------
-//
-void CApSelQueryDialog::FillListBoxWithDataL()
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSelQueryDialog::LoadIconsL()
-// called when listbox is constructed 
-// ---------------------------------------------------------
-//
-TInt CApSelQueryDialog::LoadIconsL()
-    {
-    return 0;
-    }
-
-// End of File
--- a/apengine/apsettingshandlerui/src/ApSelectorDialog.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,313 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Defines dialog CApSelectorDialog for access point selection.
-*
-*/
-
-
-// INCLUDE FILES
-#include "APSettingsHandlerUIVariant.hrh"
-
-#include <aknnavide.h>
-#include <akntitle.h>
-#include <eikmenup.h>
-
-#include <ApListItem.h>
-#include <apsetui.rsg>
-
-#include <featmgr.h>
-
-#include "ApSelectorDialog.h"
-#include "ApSelectorListBoxModel.h"
-#include "ApSelectorListbox.h"
-#include "ApSettingsModel.h"
-#include "ApsettingshandleruiImpl.h"
-#include "ApSettingsHandlerUI.hrh"
-#include "TextOverrides.h"
-
-#include "ApSettingsHandlerLogger.h"
-
-#include <VpnApEngine.h>
-// CONSTANTS
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-// ---------------------------------------------------------
-// CApSelectorDialog::ConstructAndRunLD
-// Constructs the dialog and runs it.
-// ---------------------------------------------------------
-//
-TInt CApSelectorDialog::ConstructAndRunLD( CApSettingsModel& aModel,
-                                          CApSettingsHandlerImpl& aHandler,
-                                          TUint32 aHighLight,
-                                          TUint32& aSelected )
-    {
-    return 0;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::~CApSelectorDialog
-// Destructor
-// ---------------------------------------------------------
-//
-CApSelectorDialog::~CApSelectorDialog()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::NewLC
-// Two-phase dconstructor, second phase is ConstructAndRunLD
-// ---------------------------------------------------------
-//
-CApSelectorDialog* CApSelectorDialog::NewL(
-                                        TSelectionListType aListType,
-                                        TSelectionMenuType aSelMenuType,
-                                        TInt aIspFilter,
-                                        TInt aBearerFilter,
-                                        TInt aSortType,
-                                        TUint32& aEventStore,
-                                        TBool aNoEdit,
-                                        TInt aReqIpvType
-                                        )
-    {
-    return NULL;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::CApSelectorDialog
-// Constructor
-// ---------------------------------------------------------
-//
-CApSelectorDialog::CApSelectorDialog( TSelectionListType aListType,
-                                      TSelectionMenuType aSelMenuType,
-                                      TInt aIspFilter,
-                                      TInt aBearerFilter,
-                                      TInt aSortType,
-                                      TUint32& aEventStore,
-                                      TBool aNoEdit,
-                                      TInt aReqIpvType
-                                     )
-:iListType( aListType ),
-iSelMenuType( aSelMenuType ),
-iIspFilter( aIspFilter ),
-iBearerFilter( aBearerFilter ),
-iSortType( aSortType ),
-iEventStore( &aEventStore ),
-iNeedUnlock( EFalse ),
-iModelPassed( EFalse ),
-iExitReason( EExitNone ),
-iReqIpvType( aReqIpvType ),
-iInitialised( EFalse ),
-iNoEdit(aNoEdit)
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::InitTextsL
-// called before the dialog is shown
-// to initialize localized textual data
-// ---------------------------------------------------------
-//
-void CApSelectorDialog::InitTextsL()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::HandleListboxDataChangeL
-// called before the dialog is shown to initialize listbox data
-// ---------------------------------------------------------
-//
-void CApSelectorDialog::HandleListboxDataChangeL()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::SetTextOverrides
-// called by framework before dialog is shown
-// ---------------------------------------------------------
-//
-void CApSelectorDialog::SetTextOverrides( CTextOverrides *aOverrides )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::CheckIfEmptyL()
-// called on activation and after the db has changed
-// used to handle empty list - query
-// ---------------------------------------------------------
-//
-void CApSelectorDialog::CheckIfEmptyL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::ActivateL()
-// called after the dialog is shown
-// used to handle empty list - query
-// ---------------------------------------------------------
-//
-void CApSelectorDialog::ActivateL()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::GetHelpContext()
-// ---------------------------------------------------------
-//
-void CApSelectorDialog::GetHelpContext(TCoeHelpContext& aContext) const
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::HandleApDbEventLw
-// called by the active access point framework
-// ---------------------------------------------------------
-//
-void CApSelectorDialog::HandleApDbEventL( TEvent anEvent )
-    {
-    }
-
-
-
-// From MEikCommandObserver
-void CApSelectorDialog::ProcessCommandL( TInt aCommandId )
-    {
-    }
-
-
-
-
-// From MEikListBoxObserver
-void CApSelectorDialog::HandleListBoxEventL( CEikListBox* /*aListBox*/,
-                                             TListBoxEvent aEventType )
-    {
-    }
-
-
-
-//----------------------------------------------------------
-// CApSelectorDialog::CreateCustomControlL
-//----------------------------------------------------------
-//
-SEikControlInfo CApSelectorDialog::CreateCustomControlL
-( TInt aControlType )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-//----------------------------------------------------------
-// CApSelectorDialog::DynInitMenuPaneL
-//----------------------------------------------------------
-//
-void CApSelectorDialog::DynInitMenuPaneL( TInt aResourceId,
-                                         CEikMenuPane* aMenuPane )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::OfferKeyEventL();
-// ---------------------------------------------------------
-//
-TKeyResponse CApSelectorDialog::OfferKeyEventL(const TKeyEvent& aKeyEvent,
-                                               TEventCode aType)
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::PreLayoutDynInitL();
-// called by framework before dialog is shown
-// ---------------------------------------------------------
-//
-void CApSelectorDialog::PreLayoutDynInitL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::PreLayoutDynInitL();
-// called by framework before dialog is shown
-// ---------------------------------------------------------
-//
-void CApSelectorDialog::PostLayoutDynInitL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::OkToExitL( TInt aButtonId )
-// called by framework when the OK button is pressed
-// ---------------------------------------------------------
-//
-TBool CApSelectorDialog::OkToExitL( TInt aButtonId )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::SetHighlighted()
-// called when needs to change the highlighting
-// ---------------------------------------------------------
-//
-void CApSelectorDialog::SetHighlighted()
-    {
-    }
-
-
-
-
-
-
-// ---------------------------------------------------------
-// CApSelectorDialog::DoProcessCommandL
-// called when needs to change the highlighting
-// ---------------------------------------------------------
-//
-void CApSelectorDialog::DoProcessCommandL( TInt aCommandId )
-    {
-    }
-
-
-
-// End of File
-
--- a/apengine/apsettingshandlerui/src/ApSelectorListBox.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,146 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Implementation of CApSelectorListbox.
-*
-*/
-
-
-// INCLUDE FILES
-
-#include <eikclbd.h>
-#include <AknIconArray.h>
-//#include <EIKON.mbg>
-#include <avkon.mbg>
-#include <aknkeys.h>
-#include <apsetui.rsg>
-#include <featmgr.h>
-
-#include "ApSelectorListbox.h"
-#include "ApSelectorListBoxModel.h"
-#include "ApListItem.h"
-
-#include <AknsUtils.h>
-#include <apsettings.mbg>
-#include <data_caging_path_literals.hrh>
-
-#include "ApSettingsHandlerLogger.h"
-
-// CONSTANTS
-// Drive and file name of the MBM file containing icons for Protection
-_LIT( KFileIcons, "z:ApSettings.mbm" );
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CApSelectorListbox::NewL
-// ---------------------------------------------------------
-//
-CApSelectorListbox* CApSelectorListbox::NewL
-( const CCoeControl* aParent )
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CApSelectorListbox::CApSelectorListbox
-// ---------------------------------------------------------
-//
-CApSelectorListbox::CApSelectorListbox()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelectorListbox::~CApSelectorListbox
-// ---------------------------------------------------------
-//
-CApSelectorListbox::~CApSelectorListbox()
-    {
-
-    }
-
-
-// ---------------------------------------------------------
-// CApSelectorListbox::OfferKeyEventL
-// ---------------------------------------------------------
-//
-TKeyResponse CApSelectorListbox::OfferKeyEventL
-( const TKeyEvent& aKeyEvent, TEventCode aType )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelectorListbox::FocusChanged
-// ---------------------------------------------------------
-//
-void CApSelectorListbox::FocusChanged( TDrawNow aDrawNow )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelectorListbox::LoadIconsL
-// ---------------------------------------------------------
-//
-void CApSelectorListbox::LoadIconsL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelectorListbox::Uid4Item
-// ---------------------------------------------------------
-//
-TUint32 CApSelectorListbox::Uid4Item( TInt aItem ) const
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CApSelectorListbox::CurrentItemUid
-// ---------------------------------------------------------
-//
-TUint32 CApSelectorListbox::CurrentItemUid() const
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelectorListbox::CurrentItemNameL
-// ---------------------------------------------------------
-//
-const TDesC& CApSelectorListbox::CurrentItemNameL()
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApSelectorListbox::HandleResourceChange
-// ---------------------------------------------------------
-//
-void CApSelectorListbox::HandleResourceChange(TInt aType)
-    {
-    }
-
-// End of File
--- a/apengine/apsettingshandlerui/src/ApSelectorListBoxModel.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,118 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Implementation of CApSelectorListboxModel.
-*
-*/
-
-
-// INCLUDE FILES
-
-#include "ApSelectorListBoxModel.h"
-#include "ApListItem.h"
-#include <ApSettingsHandlerCommons.h>
-
-#include <featmgr.h>
-
-#include "ApSettingsHandlerLogger.h"
-
-// CONSTANTS
-const TInt  KGPRS_ICON_ID        = 0;
-// No icon for CDMA (yet?) -> use GPRS icon.
-const TInt  KCDMA_ICON_ID        = KGPRS_ICON_ID;
-const TInt  KCSD_ICON_ID         = 1;
-const TInt  KHSCSD_ICON_ID       = 2;
-// const TInt  KSMS_ICON_ID       = 3;   // DEPRECATED
-const TInt  KWLAN_ICON_ID        = 4;
-// fith icon element is the KEASY_WLAN_ICON_ID  but it is not shown 
-// in our UI, but is used by other modules using our 
-// resources!!! const TInt  KEASY_WLAN_ICON_ID   = 5;
-
-const TInt  KPROTECTED_ICON_ID   = 6;
-// get real icons !!! now using GPRS...
-#ifdef __TEST_LAN_BEARER
-    const TInt  KLAN_ICON_ID         = KGPRS_ICON_ID;
-#endif // __TEST_LAN_BEARER
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CApSelectorListboxModel::CApSelectorListboxModel
-// ---------------------------------------------------------
-//
-CApSelectorListboxModel::CApSelectorListboxModel( TGraphicType aGraphicType )
-:CApListItemList(),
-iOffset( 0 ),
-iFeatureInitialised(EFalse),
-iProtectionSupported(EFalse)
-    {
-    }
-
-// ---------------------------------------------------------
-// CApSelectorListboxModel::~CApSelectorListboxModel
-// ---------------------------------------------------------
-//
-CApSelectorListboxModel::~CApSelectorListboxModel()
-    {
-    }
-
-// ---------------------------------------------------------
-// CApSelectorListboxModel::MdcaCount
-// ---------------------------------------------------------
-//
-TInt CApSelectorListboxModel::MdcaCount() const
-    {
-    return 0;
-    }
-
-// ---------------------------------------------------------
-// CApSelectorListboxModel::MdcaPoint
-// ---------------------------------------------------------
-//
-TPtrC CApSelectorListboxModel::MdcaPoint( TInt aIndex ) const
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApSelectorListboxModel::Item4Uid
-// ---------------------------------------------------------
-//
-TInt CApSelectorListboxModel::Item4Uid( TUint32 aUid, TInt& aErr ) const
-    {
-    return KErrNotFound;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSelectorListboxModel::SetOwnIconOffset
-// ---------------------------------------------------------
-//
-void CApSelectorListboxModel::SetOwnIconOffset( TInt aOffset )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSelectorListboxModel::FormatListboxText
-// ---------------------------------------------------------
-//
-void CApSelectorListboxModel::FormatListboxText( TInt aIndex,
-                                                TDes& aBuf ) const
-    {
-    }
-
-// End of File
--- a/apengine/apsettingshandlerui/src/ApSettingsCommons.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*    Defines common methods.
-*
-*/
-
-
-
-// INCLUDE FILES
-#include <e32def.h>
-#include <e32std.h>
-#include <eikenv.h>
-#include <ApSettingsHandlerCommons.h>
-#include "ApSettingsHandlerUI.hrh"
-#include <apsetui.rsg>
-#include <AknQueryDialog.h>
-#include <aknnotedialog.h>
-#include <StringLoader.h>
-
-#include <AknProgressDialog.h>
-#include <AknWaitDialog.h>
-
-#include "ApSettingsHandlerLogger.h"
-
-void Panic( TApSettingsHandlerUiPanicCodes aPanic )
-    {
-    APSETUILOGGER_ENTERFN( EOther,"Commons::Panic")
-    
-    _LIT( kApSet, "APSettingsHandlerUi" ) ;
-    User::Panic( kApSet, aPanic ) ;
-    }
-
-
-// ---------------------------------------------------------
-// AskQueryL
-// ---------------------------------------------------------
-//
-TInt AskQueryL( TInt aResId, TDesC* aVar )
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// ShowNoteL
-// ---------------------------------------------------------
-//
-TInt ShowNoteL( TInt aResId, TDesC* aVar )
-    {
-    return 0;
-    }
-
-
-#ifdef __TEST_OOMDEBUG
-    TInt GetTestStateL()
-        {
-        return 0;
-        }
-#endif // __TEST_OOMDEBUG
-
-// End of File
--- a/apengine/apsettingshandlerui/src/ApSettingsDlg.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1081 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Defines dialog for access point view/edit.
-*
-*/
-
-
-// INCLUDE FILES
-#include "APSettingsHandlerUIVariant.hrh"
-
-
-#include <aknnavide.h>
-#include <akntitle.h>
-#include <AknQueryDialog.h>
-#include <akntextsettingpage.h>
-#include <aknpopupsettingpage.h>
-#include <aknradiobuttonsettingpage.h>
-#include <aknpasswordsettingpage.h>
-#include <aknmfnesettingpage.h>
-
-#include <ApAccessPointItem.h>
-#include <utf.h>
-
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <nifvar_internal.h>
-#endif
-
-
-#include "ApSettingsLookups.h"
-#include "ApSettingsDlg.h"
-#include "ApSettingsModel.h"
-#include <apsetui.rsg>
-
-#include "ApSettingsHandlerUI.hrh"
-#include "ApsettingshandleruiImpl.h"
-#include "ApSettingsHandlerConsts.h"
-#include <ApSettingsHandlerCommons.h>
-
-#include "ApSettingsHandlerLogger.h"
-
-#include <commonphoneparser.h>
-
-#include "ApNetSelPopupList.h"
-
-#include "AccessPointTextSettingPage.h"
-
-
-#include <featmgr.h>
-
-#include "FeatureManagerWrapper.h"
-#include "ApMultiLineDataQueryDialog.h"
-
-#include <ConnectionUiUtilities.h>
-#include <wlanmgmtcommon.h>
-#include <centralrepository.h>
-
-// CONSTANTS
-// General Settings UID, Hardcoded
-// const TUid KGeneralSettingsUid={0X100058EC};
-//        const TInt KOptionalDefaultValue    = 1;
-        
-
-
-const TInt KIspCallAnalogue         = 0;
-const TInt KIspCallIsdn110          = 1;
-const TInt KIspCallIsdn120          = 2;
-
-const TInt KBearerListGprs          = 0;
-const TInt KBearerListWLAN          = 1;
-const TInt KBearerListCSD           = 2;
-const TInt KBearerListHSCSD         = 3;
-
-
-
-// They provide the indexes.
-const TInt KBearerArrayCSD           = 0;
-const TInt KBearerArrayGPRS          = 1;
-const TInt KBearerArrayHSCSD         = 2;
-const TInt KBearerArrayWLAN          = 3;
-
-const TInt KBoolMaxNumber           = 1;
-
-_LIT( KEmptyText, "" );
-_LIT( KTxtListItemFormat, " \t%S\t\t%S" );
-_LIT( KTxtMenuListItemFormat, " \t%S\t\t" );
-_LIT( KTxtCompulsory, "\t*" );
-
-_LIT( KTxtNumber, "%d" );
-
-
-_LIT( KKnownNameServer1, "fec0:000:0000:ffff::1" );
-_LIT( KKnownNameServer2, "fec0:000:0000:ffff::2" );
-
-
-const TInt KStaredPasswordLength = 4;
-
-const TUint32 KDefAdhocChannel = 7;
-
-
-const TInt  KItemIndex0 = 0;
-const TInt  KItemIndex1 = 1;
-const TInt  KItemIndex2 = 2;
-const TInt  KItemIndex3 = 3;
-
-// ================= MEMBER FUNCTIONS =======================
-// ---------------------------------------------------------
-// CApSettingsDlg::ConstructAndRunLD
-// Constructs the dialog and runs it.
-// ---------------------------------------------------------
-//
-TInt CApSettingsDlg::ConstructAndRunLD( CApSettingsModel& aModel,
-                                        CApSettingsHandlerImpl& aHandler,
-                                        TUint32& aUid,
-                                        CApAccessPointItem* aItem )
-    {
-    return 0;
-    }
-
-
-
-// Destructor
-CApSettingsDlg::~CApSettingsDlg()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::OfferKeyEventL( const TKeyEvent& aKeyEvent, 
-//                                 TEventCode aType )
-//  Handles key events
-// ---------------------------------------------------------
-//
-TKeyResponse CApSettingsDlg::OfferKeyEventL( const TKeyEvent& aKeyEvent, 
-                                             TEventCode aType )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::NewL
-// Two-phase dconstructor, second phase is ConstructAndRunLD
-// ---------------------------------------------------------
-//
-CApSettingsDlg* CApSettingsDlg::NewL( TInt aIspFilter,
-                                      TInt aBearerFilter,
-                                      TInt aSortType,
-                                      TUint32& aEventStore,
-                                      TInt aReqIpvType
-                                      )
-    {
-    return NULL;
-    }
-
-
-
-
-// Constructor
-CApSettingsDlg::CApSettingsDlg( TInt aIspFilter, TInt aBearerFilter, 
-                                TInt aSortType, TUint32& aEventStore,
-                                TInt aReqIpvType )
-:
-iLevel( 0 ),
-iOldIndex( 0 ),
-iOldTopIndex( 0 ),
-iAdvIndex( 0 ),
-iBearerType( EApBearerTypeAll ),
-iIspFilter( aIspFilter ),
-iBearerFilter( aBearerFilter ),
-iSortType( aSortType ),
-iEventStore( &aEventStore ),
-iFieldCount( 0 ),
-iAdvancedFieldCount( 0 ),
-iExitReason( EExitNone ),
-iReqIpvType( aReqIpvType ),
-iL2Ipv4( ETrue ),
-iSecSettingsExitReason(0)
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::OkToExitL( TInt aButtonId)
-// called by framework when the OK button is pressed
-// ---------------------------------------------------------
-//
-TBool CApSettingsDlg::OkToExitL( TInt aButtonId )
-    {
-    return EFalse;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::InitTextsL
-// called before the dialog is shown
-// to initialize localized textual data
-// ---------------------------------------------------------
-//
-void CApSettingsDlg::InitTextsL()
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::DynInitMenuPaneL
-// ---------------------------------------------------------
-//
-void CApSettingsDlg::DynInitMenuPaneL
-( TInt aResourceId, CEikMenuPane* aMenuPane )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::HandleListboxDataChangeL
-// called before the dialog is shown to initialize listbox data
-// ---------------------------------------------------------
-//
-void CApSettingsDlg::HandleListboxDataChangeL( TBool aReRead )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::SetTextOverrides
-// ---------------------------------------------------------
-//
-void CApSettingsDlg::SetTextOverrides( CTextOverrides* aOverrides )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::HandleApDbEventL
-// called by the active access point framework
-// ---------------------------------------------------------
-//
-void CApSettingsDlg::HandleApDbEventL( TEvent anEvent )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::GetHelpContext()
-// ---------------------------------------------------------
-//
-void CApSettingsDlg::GetHelpContext(TCoeHelpContext& aContext) const
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::PreLayoutDynInitL();
-// called by framework before dialog is shown
-// ---------------------------------------------------------
-//
-void CApSettingsDlg::PreLayoutDynInitL()
-    {
-    }
-
-
-
-
-// From MEikCommandObserver
-void CApSettingsDlg::ProcessCommandL( TInt aCommandId )
-    {
-    }
-
-
-// From MEikListBoxObserver
-void CApSettingsDlg::HandleListBoxEventL( CEikListBox* /*aListBox*/,
-                                          TListBoxEvent aEventType )
-    {
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::FillListWithDataL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::FillListWithDataL( CDesCArrayFlat& aItemArray,
-                                        const TApMember& arr, TInt aLength,
-                                        const TInt* aRes,
-                                        const TInt* aCompulsory )
-    {
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::AddTextualListBoxItemL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::AddTextualListBoxItemL( CDesCArrayFlat& aItemArray,
-                                             TApMember aMember, TInt aRes,
-                                             TInt aCompulsory )
-    {
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::AddOnOffListBoxItem
-//----------------------------------------------------------
-//
-void CApSettingsDlg::AddOnOffListBoxItemL( CDesCArrayFlat& aItemArray,
-                                           TApMember aMember, TInt aRes,
-                                           TInt aCompulsory )
-    {
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::UpdateOnOffListBoxItemL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::UpdateOnOffListBoxItemL( TApMember aMember, TInt aRes, 
-                                              TInt aPos, TInt aCompulsory )
-    {
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::TextualListBoxItemL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::UpdateTextualListBoxItemL( TApMember aMember, TInt aRes,
-                                                TInt aPos, TInt aCompulsory  )
-    {
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::CreateTextualListBoxItem
-//----------------------------------------------------------
-//
-HBufC*  CApSettingsDlg::CreateTextualListBoxItemL( TApMember aMember, 
-                                                   TInt aRes, 
-                                                   TInt aCompulsory )
-    {
-    return NULL;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::CreateOnOffListBoxItemL
-//----------------------------------------------------------
-//
-HBufC*  CApSettingsDlg::CreateOnOffListBoxItemL( TApMember aMember, TInt aRes,
-                                                 TInt aCompulsory )
-    {
-    return NULL;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::ChangeSettingsL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::ChangeSettingsL( TBool aQuick )
-    {
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::SetBearerTypeL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::SetBearerTypeL( TApBearerType aBearer )
-    {
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::InvertSettingsL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::InvertSettingsL( TApMember aDataMember )
-    {
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::ShowPopupSettingPageL
-//----------------------------------------------------------
-//
-TBool CApSettingsDlg::ShowPopupSettingPageL( TApMember aData )
-    {
-    return EFalse;
-    }
-
-
-
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::ShowPopupTextSettingPageL
-//----------------------------------------------------------
-//
-TBool CApSettingsDlg::ShowPopupTextSettingPageL( TApMember aData )
-    {
-    return EFalse;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetTextLC
-//----------------------------------------------------------
-//
-HBufC* CApSettingsDlg::GetTextLC( TApMember aData )
-    {
-    return NULL;
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetTextResId
-//----------------------------------------------------------
-//
-void CApSettingsDlg::GetTextResId( TApMember aData, TInt& apage, 
-                                   TInt& aTextSettingPageFlags )
-    {
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetResId
-//----------------------------------------------------------
-//
-void CApSettingsDlg::GetResId( TApMember aData, TInt& aattr )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::FillPopupSettingPageL
-// ---------------------------------------------------------
-//
-CDesCArrayFlat* CApSettingsDlg::FillPopupSettingPageLC( TApMember aData, 
-                                                        TInt& aCurrvalue )
-    {
-    return NULL;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::UpdateFromPopupSettingPageL
-// ---------------------------------------------------------
-//
-void CApSettingsDlg::UpdateFromPopupSettingPageL( TApMember aData, 
-                                                  TInt aCurrvalue )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::CanSaveL( )
-// ---------------------------------------------------------
-//
-CApSettingsDlg::TSaveAction CApSettingsDlg::CanSaveL( TApMember& aDataNeeded )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::ShowPopupIpAddrSettingPageL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::ShowPopupIpAddrSettingPageL( TApMember aData )
-    {
-    }
-
-
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::ShowPopupPhoneNumSettingPageL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::ShowPopupPhoneNumSettingPageL( TApMember aData )
-    {
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::ShowPopupPasswordPageL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::ShowPopupPasswordPageL( TApMember aData )
-    {
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetBoolDataValue
-//----------------------------------------------------------
-//
-void CApSettingsDlg::GetBoolDataValue( TApMember aData, TBool aInvert, 
-                                       TInt& aCurrvalue)
-    {
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::DoBearerChangeL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::DoBearerChangeL( TInt aCurrvalue)
-    {
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::HandleBearerChangeL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::HandleBearerChangeL( TApBearerType aBearer)
-    {
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::BearerToArrayIndexL
-//----------------------------------------------------------
-//
-TInt32 CApSettingsDlg::BearerToArrayIndexL( TApBearerType aBearer)
-    {
-    return 0;
-    }
-
-/*
-//----------------------------------------------------------
-// CApSettingsDlg::ArrayIndexToBearer
-//----------------------------------------------------------
-//
-TApBearerType CApSettingsDlg::ArrayIndexToBearer( TInt32 aIndex)
-    {
-    APSETUILOGGER_ENTERFN( ESettings,"Settings::ArrayIndexToBearer")
-    
-    TApBearerType retval( EApBearerTypeGPRS );
-    switch( aIndex )
-        {
-        case KBearerArrayCSD:
-            {
-            retval = EApBearerTypeCSD;
-            break;
-            }
-        case KBearerArrayGPRS:
-            {
-            retval = EApBearerTypeGPRS;
-            break;
-            }
-        case KBearerArrayHSCSD:
-            {
-            retval = EApBearerTypeHSCSD;
-            break;
-            }
-        case KBearerArrayWLAN:
-            {
-            if ( IsWlanSupported() )
-                {
-                retval = EApBearerTypeWLAN;
-                }
-            else
-                {
-                User::Leave( KErrNotSupported );
-                }
-            break;
-            }
-        default:
-            {
-            __ASSERT_DEBUG( EFalse, Panic( EInvalidBearerType ) );
-            break;
-            }
-        }
-    
-    APSETUILOGGER_LEAVEFN( ESettings,"Settings::ArrayIndexToBearer")
-    return retval;
-    }
-
-*/
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::FillUpBearerSpeedValuesL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::FillUpBearerSpeedValuesL( CDesCArrayFlat& aItems, 
-                                               TInt& aCurrvalue )
-    {
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::SaveDataL
-//----------------------------------------------------------
-//
-TBool CApSettingsDlg::SaveDataL( )
-    {
-    return EFalse;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::HandleListStructureChangeL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::HandleListStructureChangeL()
-    {
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::LimitSpeed
-//----------------------------------------------------------
-//
-void CApSettingsDlg::LimitSpeed()
-    {
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::SelectItem
-//----------------------------------------------------------
-//
-void CApSettingsDlg::SelectItem( TInt aItemIndex )
-    {
-    }
-
-
-
-
-
-// Converting EParagraphDelimiters to \ns
-// ---------------------------------------------------------
-// CApSettingsDlg::ConvertDelimToPerNLC
-// ---------------------------------------------------------
-//
-HBufC* CApSettingsDlg::ConvertDelimToPerNLC( const TDesC& aInText )
-    {
-    return NULL;
-    }
-
-
-
-// Converting \ns to EParagraphDelimiters
-// ---------------------------------------------------------
-// CApSettingsDlg::ConvertPerNToDelimLC
-// ---------------------------------------------------------
-//
-
-HBufC* CApSettingsDlg::ConvertPerNToDelimLC( const TDesC& aInText )
-    {
-    return NULL;
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::DoChangeSettingsL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::DoChangeSettingsL( TBool aQuick )
-    {
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetSpeedForSelection
-//----------------------------------------------------------
-//
-TApCallSpeed CApSettingsDlg::GetBearerSpeedForSelection( TInt aCurrvalue )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetCurrIndexFromBearerSpeed
-//----------------------------------------------------------
-//
-TInt CApSettingsDlg::GetCurrIndexFromBearerSpeed( )
-    {
-    return 0;
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::ReplaceNonPrintingCharactersLC
-//----------------------------------------------------------
-//
-HBufC* CApSettingsDlg::ReplaceWhiteSpaceCharactersLC(  const TDesC& aInText )
-    {
-    return NULL;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::ChangeNetworkGroupL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::ChangeNetworkGroupL()
-    {
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::IsHSCSDEnabledL
-//----------------------------------------------------------
-//
-TInt CApSettingsDlg::IsHSCSDEnabledL()
-    {
-    return EFalse;
-    }
-
-
-
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetCSDSettingArrays
-//----------------------------------------------------------
-//
-void CApSettingsDlg::GetCSDSettingArrays( TInt variant )
-    {
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetGPRSSettingArrays
-//----------------------------------------------------------
-//
-void CApSettingsDlg::GetGPRSSettingArrays( TInt variant )
-    {
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetWLANSettingArraysL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::GetWLANSettingArraysL( TInt /*aVariant*/ )
-    {
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetNameServersL
-//----------------------------------------------------------
-//
-TInt CApSettingsDlg::GetNameServersL( TBool aIp6 )
-    {
-    return 0;
-    }
-
-
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::AddMenuListBoxItemL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::AddMenuListBoxItemL( CDesCArrayFlat& aItemArray,
-                                          TApMember /*aMember*/, TInt aRes,
-                                          TInt aCompulsory )
-    {
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::AskQueryIfWcdmaL
-//----------------------------------------------------------
-//
-TBool CApSettingsDlg::AskQueryIfWcdmaL( TApMember aMember, TInt aCurrvalue  )
-    {
-    return EFalse;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetDomainNameServersTypeL
-//----------------------------------------------------------
-//
-TInt CApSettingsDlg::GetDomainNameServersTypeL()
-    {
-    return 0;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetIpv4NameServerL
-//----------------------------------------------------------
-//
-TInt CApSettingsDlg::GetIpv4NameServerL()
-    {
-    return 0;
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetIpv6NameServerL
-//----------------------------------------------------------
-//
-TInt CApSettingsDlg::GetIpv6NameServerL()
-    {
-    return 0;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetIPv6DNSTypeL
-//----------------------------------------------------------
-//
-TInt CApSettingsDlg::GetIPv6DNSTypeL()
-    {
-    return 0;
-    }
-
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetIPv4DNSTypeL
-//----------------------------------------------------------
-//
-TInt CApSettingsDlg::GetIPv4DNSTypeL()
-    {
-    return 0;
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::StripNonNumberLC
-// ---------------------------------------------------------
-//
-HBufC* CApSettingsDlg::StripNonNumberLC( const TDesC16& aInText )
-    {
-    return NULL;
-    }
-    
-
-//----------------------------------------------------------
-// CApSettingsDlg::BearerType2BearerItemPosL
-//----------------------------------------------------------
-//
-TInt CApSettingsDlg::BearerType2BearerItemPosL( TApBearerType aBearer )
-    {
-    return 0;
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::BearerItemPos2BearerTypeL
-//----------------------------------------------------------
-//
-TApBearerType CApSettingsDlg::BearerItemPos2BearerTypeL( TInt aPos )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::ChangeWlanNetworkNameL
-//----------------------------------------------------------
-//
-void CApSettingsDlg::ChangeWlanNetworkNameL()
-    {
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::ChangeWlanSecuritySettings
-//----------------------------------------------------------
-//
-TInt CApSettingsDlg::ChangeWlanSecuritySettingsL()
-    {
-    return 0;
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::ChangeWepSecuritySettingsL
-//----------------------------------------------------------
-//
-TInt CApSettingsDlg::ChangeWepSecuritySettingsL()
-    {
-    return 0;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::ChangeWpaSecuritySettingsL
-//----------------------------------------------------------
-//
-TInt CApSettingsDlg::ChangeWpaSecuritySettingsL()
-    {
-    return 0;
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::Change8021xSecuritySettingsL
-//----------------------------------------------------------
-//
-TInt CApSettingsDlg::Change8021xSecuritySettingsL()
-    {
-    return 0;
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::IsWlanSupported
-//----------------------------------------------------------
-//
-TBool CApSettingsDlg::IsWlanSupported()
-    {
-    return EFalse;
-    }
-    
-    
-
-//----------------------------------------------------------
-// CApSettingsDlg::QueryWlanNetworkNameL
-//----------------------------------------------------------
-//
-TBool CApSettingsDlg::QueryWlanNetworkNameL()
-    {
-    return EFalse;
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::IsNetMaskAndGatewayVisible
-//----------------------------------------------------------
-//
-TBool CApSettingsDlg::IsNetMaskAndGatewayVisibleL()
-    {
-    return EFalse;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::GetAdHocChannelL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsDlg::GetAdHocChannelL()
-    {
-    return 0;
-    }
-    
-    
-    
-//----------------------------------------------------------
-// CApSettingsDlg::IsAdhocChannelVisible
-//----------------------------------------------------------
-//
-TBool CApSettingsDlg::IsAdhocChannelVisible() 
-    {
-    return EFalse;
-    }
-    
-    
-
-//----------------------------------------------------------
-// CApSettingsDlg::HasSecuritySettingsFilledL
-//----------------------------------------------------------
-//
-TBool CApSettingsDlg::HasSecuritySettingsFilledL()
-    {
-    return EFalse;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsDlg::LimitSecMode
-//----------------------------------------------------------
-//
-void CApSettingsDlg::LimitSecMode()
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::CanSaveWlanCompulsoriesL( )
-// ---------------------------------------------------------
-//
-CApSettingsDlg::TSaveAction CApSettingsDlg::CanSaveWlanCompulsoriesL( 
-                                                TApMember& aDataNeeded )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsDlg::RestoreIpv4SettingsL()
-// ---------------------------------------------------------
-//
-void CApSettingsDlg::RestoreIpv4SettingsL()
-    {
-    }
-
-
-    
-// End of File
--- a/apengine/apsettingshandlerui/src/ApSettingsModel.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,564 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Implementation of CApSettingsModel.
-*
-*/
-
-
-// INCLUDE FILES
-#include "APSettingsHandlerUIVariant.hrh"
-
-#include <ActiveApDb.h>
-#include <ApListItemList.h>
-#include <ApListItem.h>
-#include <ApSelect.h>
-#include <apsetui.rsg>
-#include <VpnApEngine.h>
-#include <hlplch.h>
-#include <eikenv.h>
-#include <eikappui.h>
-#include <StringLoader.h>
-#include <featmgr.h>
-
-#include "ApSettingsHandlerUI.hrh"
-
-#include "ApSettingsModel.h"
-#include <ApSettingsHandlerCommons.h>
-#include "Apsettingsdeleteoperation.h"
-
-#include <sysutil.h>
-#include <ErrorUI.h>
-
-
-#include "ApNetworks.h"
-#include "FeatureManagerWrapper.h"
-
-#include <ApAccessPointItem.h>
-
-#include "ApSettingsHandlerLogger.h"
-
-//#define __TEST_PERFORMANCE
-
-// CONSTANTS
-
-
-
-
-/**
-* Estimated number of bytes in FFS for one writing operation. This amount
-* is checked to be available before each transaction which places write-lock.
-* Exact size is not known (because what happens in a transaction is unknown).
-* A typical access point is estimated to be less than ~2000 bytes; 
-* so assuming the typical operation of adding one access point 
-* (with database transaction overhead and safety) is estimated 
-* to be 2000 bytes. This should be a safe guess.
-*/
-LOCAL_C const TInt KEstimatedFfsUsage = 2000;
-
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CApSettingsModel::NewL
-// ---------------------------------------------------------
-//
-CApSettingsModel* CApSettingsModel::NewL( TInt aIspFilter, TInt aBearerFilter,
-                                          TInt aSortType, TInt aReqIpvType,
-                                          TVpnFilterType aVpnFilterType,
-                                          TInt aVariant,
-                                          TBool aIncludeEasyWlan,
-                                          TBool aNoEdit )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::NewL
-// ---------------------------------------------------------
-//
-CApSettingsModel* CApSettingsModel::NewL( CActiveApDb& aDb, TInt aIspFilter,
-                                          TInt aBearerFilter, TInt aSortType,
-                                          TInt aReqIpvType, 
-                                          TVpnFilterType aVpnFilterType,
-                                          TInt aVariant,
-                                          TBool aIncludeEasyWlan,
-                                          TBool aNoEdit )
-    {
-    return NULL;
-    }
-
-
-/**
-* Destructor.
-*/
-CApSettingsModel::~CApSettingsModel( )
-    {
-    }
-
-
-/**
-* Constructor
-*/
-CApSettingsModel::CApSettingsModel( TInt aIspFilter, TInt aBearerFilter, 
-                                    TInt aSortType, TInt aReqIpvType,
-                                    TInt aVariant,
-                                    TVpnFilterType aVpnFilterType,
-                                    TBool aIncludeEasyWlan,
-                                    TBool aNoEdit )
-
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::ConstructL
-// ---------------------------------------------------------
-//
-void CApSettingsModel::ConstructL( CActiveApDb* aDb )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::Database
-// ---------------------------------------------------------
-//
-CActiveApDb* CApSettingsModel::Database()
-    {
-    return NULL;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::AllListItemDataL
-// ---------------------------------------------------------
-//
-TInt CApSettingsModel::AllListItemDataL( TBool& aFailedLocked, 
-                                         CApListItemList& aList, 
-                                         TInt aIspFilter, TInt aBearerFilter,
-                                         TInt aSortType, TInt aReqIpvType )
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::AllListItemDataL
-// ---------------------------------------------------------
-//
-TInt CApSettingsModel::AllListItemDataL( 
-                                        TBool& aFailedLocked,
-                                        CApListItemList& aList,
-                                        TInt aIspFilter,
-                                        TInt aBearerFilter,
-                                        TInt aSortType,
-                                        TInt aReqIpvType,
-                                        TVpnFilterType aVpnFilterType,
-                                        TBool aIncludeEasyWlan
-                                        )
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::AllListItemDataL
-// ---------------------------------------------------------
-//
-TInt CApSettingsModel::AllListItemDataL( TBool& aFailedLocked, 
-                                         CApListItemList& aList )
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::AccessPointDataL
-// ---------------------------------------------------------
-//
-void CApSettingsModel::AccessPointDataL( TUint32 aUid, 
-                                         CApAccessPointItem& aApItem )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::UpdateAccessPointDataL
-// ---------------------------------------------------------
-//
-TBool CApSettingsModel::UpdateAccessPointDataL( CApAccessPointItem& aApItem )
-    {
-    return EFalse;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::DataHandler
-// ---------------------------------------------------------
-//
-CApDataHandler* CApSettingsModel::DataHandler()
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::ApUtils
-// ---------------------------------------------------------
-//
-CApUtils* CApSettingsModel::ApUtils()
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::SetParams
-// ---------------------------------------------------------
-//
-void CApSettingsModel::SetParams( TApSettingsParams aParams )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::Params
-// ---------------------------------------------------------
-//
-TApSettingsParams CApSettingsModel::Params()
-    {
-    User::Leave( KErrNotSupported );
-    return iParams;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::VpnEngine
-// ---------------------------------------------------------
-//
-CVpnApEngine* CApSettingsModel::VpnEngine()
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::LaunchHelpL
-// ---------------------------------------------------------
-//
-void CApSettingsModel::LaunchHelpL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::RemoveApL
-// ---------------------------------------------------------
-//
-void CApSettingsModel::RemoveApL( TUint32 aUid )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::StarTransactionLC
-// ---------------------------------------------------------
-//
-TTransactionResult CApSettingsModel::StartTransactionLC(
-                        TBool aWrite, TBool aShowNote,
-                        TBool aRetry, TBool aLFFSChecking /* ETrue */ )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::GetWriteLockL
-// ---------------------------------------------------------
-//
-void CApSettingsModel::GetWriteLockL( )
-    {
-    }
-
-// ---------------------------------------------------------
-// CApSettingsModel::RollbackTransactionOnLeave
-// ---------------------------------------------------------
-//
-void CApSettingsModel::RollbackTransactionOnLeave( TAny* aDb )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::CommitTransaction
-// ---------------------------------------------------------
-//
-TInt CApSettingsModel::CommitTransaction()
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::FFSSpaceBelowCriticalLevelL
-// ---------------------------------------------------------
-//
-TBool CApSettingsModel::FFSSpaceBelowCriticalLevelL
-        ( TBool aShowErrorNote, TInt aBytesToWrite /*=0*/ )
-    {
-    return EFalse;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::NetWorkListDataL
-// ---------------------------------------------------------
-//
-TInt CApSettingsModel::NetWorkListDataL( TBool& aFailedLocked, 
-                                         CApNetworkItemList& aList )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::RequestedIPvType
-// ---------------------------------------------------------
-//
-TInt CApSettingsModel::RequestedIPvType( )
-    {
-    return 0;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::Need2DeleteSelect
-// called when menu needs to be displayed
-// ---------------------------------------------------------
-//
-TBool CApSettingsModel::Need2DeleteSelect(  TInt aResourceId, TInt aCount )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::Need2DeleteOpen
-// called when menu needs to be displayed
-// ---------------------------------------------------------
-//
-TBool CApSettingsModel::Need2DeleteOpen(  TInt aResourceId, TInt aCount, 
-                                          TUint32 aUid, TBool aNeedsNone )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::Need2DeleteDeleteL
-// called when menu needs to be displayed
-// ---------------------------------------------------------
-//
-TBool CApSettingsModel::Need2DeleteDeleteL(  TInt aResourceId, TInt aCount, 
-                                             TUint32 aUid, TBool aNeedsNone )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::Need2DeleteNewUseExisting
-// called when menu needs to be displayed
-// ---------------------------------------------------------
-//
-TBool CApSettingsModel::Need2DeleteNewUseExisting(  
-                                            TInt aResourceId, 
-                                            TInt aCount )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::Need2DeleteNewL
-// called when menu needs to be displayed
-// ---------------------------------------------------------
-//
-TBool CApSettingsModel::Need2DeleteNewL(  TInt aResourceId )
-    {
-    return EFalse;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::Need2DeleteHelp
-// called when menu needs to be displayed
-// ---------------------------------------------------------
-//
-TBool CApSettingsModel::Need2DeleteHelp(  TInt aResourceId )
-    {
-    return EFalse;
-    }
-
-
-
-
-
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::GetLinkedVpnAccessPointLC
-// ---------------------------------------------------------
-//
-HBufC* CApSettingsModel::GetLinkedVpnAccessPointLC( TUint32 aUid )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::EikEnv
-// ---------------------------------------------------------
-//
-CEikonEnv* CApSettingsModel::EikEnv()
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::CreateFromDataL
-// ---------------------------------------------------------
-//
-TUint32 CApSettingsModel::CreateFromDataL( CApAccessPointItem& aApItem )
-    {
-    return 0;
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::ChangeWepSettingsL
-// ---------------------------------------------------------
-//
-TInt CApSettingsModel::ChangeWepSettingsL( CApAccessPointItem* aApItem )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::ChangeWpaSettingsL
-// ---------------------------------------------------------
-//
-TInt CApSettingsModel::ChangeWpaSettingsL( CApAccessPointItem* aApItem )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::Change8021xSettingsL
-// ---------------------------------------------------------
-//
-TInt CApSettingsModel::Change8021xSettingsL( CApAccessPointItem* aApItem )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::ClearWEPAndWPASettings
-// ---------------------------------------------------------
-//
-void CApSettingsModel::ClearWEPAndWPASettings()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::WriteWlanL
-// ---------------------------------------------------------
-//
-void CApSettingsModel::WriteWlanL( CApAccessPointItem& aApItem,
-                                   TBool aIsNew )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsModel::LoadWlanL
-// ---------------------------------------------------------
-//
-void CApSettingsModel::LoadWlanL( CApAccessPointItem& aApItem )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsModel::HasWlanSecSettingsFilledL
-//----------------------------------------------------------
-//
-TBool CApSettingsModel::HasWlanSecSettingsFilledL( CApAccessPointItem& aApItem )
-    {
-    return EFalse;
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsModel::UpdateSecurityModeL
-//----------------------------------------------------------
-//
-void CApSettingsModel::UpdateSecurityModeL( CApAccessPointItem& aApItem )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-// End of File
--- a/apengine/apsettingshandlerui/src/FeatureManagerWrapper.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,61 +0,0 @@
-/*
-* Copyright (c) 2004 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Implementation of CFeatureManagerWrapper.
-*
-*/
-
-
-// INCLUDE FILES
-#include    "FeatureManagerWrapper.h"
-#include    "ApSettingsHandlerLogger.h"
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CFeatureManagerWrapper::CFeatureManagerWrapper
-// ---------------------------------------------------------
-//
-CFeatureManagerWrapper::CFeatureManagerWrapper() : CBase()
-    {
-    }
-
-// ---------------------------------------------------------
-// CFeatureManagerWrapper::~CFeatureManagerWrapper
-// ---------------------------------------------------------
-//
-CFeatureManagerWrapper::~CFeatureManagerWrapper() 
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CFeatureManagerWrapper::ConstructL
-// ---------------------------------------------------------
-//
-void CFeatureManagerWrapper::ConstructL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CFeatureManagerWrapper::NewL
-// ---------------------------------------------------------
-//
-CFeatureManagerWrapper*  CFeatureManagerWrapper::NewL()
-    {
-    return NULL;
-    }
-
-//End of file.
-
--- a/apengine/apsettingshandlerui/src/TextOverrides.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,100 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declares the CTextOverrides class.
-*
-*/
-
-
-// INCLUDE FILES
-#include "TextOverrides.h"
-#include <ApSettingsHandlerCommons.h>
-#include "ApSettingsHandlerLogger.h"
-
-// CLASS DECLARATION
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CTextOverrides::NewL
-// ---------------------------------------------------------
-//
-CTextOverrides* CTextOverrides::NewL( )
-    {
-    return NULL;
-    }
-
-
-
-// Destructor
-CTextOverrides::~CTextOverrides()
-    {
-    }
-
-
-// Constructor
-CTextOverrides::CTextOverrides()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CTextOverrides::ConstructL
-// ---------------------------------------------------------
-//
-void CTextOverrides::ConstructL( )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CTextOverrides::SetTextOverridesL
-// ---------------------------------------------------------
-//
-void CTextOverrides::SetTextOverrideL( TTextID aText2Change,
-                                                const TDesC& aNewText )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CTextOverrides::TextOverridesL
-// ---------------------------------------------------------
-//
-const TDesC& CTextOverrides::TextOverrideL( TTextID aTextId )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-// ---------------------------------------------------------
-// CTextOverrides::IsTextOverridenL
-// ---------------------------------------------------------
-//
-TBool CTextOverrides::IsTextOverridenL( TTextID aTextId )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CTextOverrides::ValidateIdL
-// ---------------------------------------------------------
-//
-void CTextOverrides::ValidateIdL( TTextID aTextId )
-    {
-    }
-
-
-// End of File
--- a/apengine/apsettingshandlerui/src/apsettingsdeleteoperation.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,248 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Implementation of class CApSettingsDeleteOperation
-*
-*/
-
-
-// INCLUDE FILES
-#include <ApDataHandler.h>
-#include <ApUtils.h>
-#include <ActiveApDb.h>
-#include <ApSettingsHandlerCommons.h>
-#include <VpnApEngine.h>
-#include <AknWaitDialog.h>
-#include <AknProgressDialog.h>
-#include <cdbcols.h>
-#include <ErrorUI.h>
-#include "Apsettingsdeleteoperation.h"
-
-#include <ApAccessPointItem.h>
-
-// Following includes are needed only for the test
-// when ALL APs are deleted (checking delays, etc.)
-// For testing purpose only, to make process time longer.
-//  TEST STARTS
-#include <ActiveApDb.h>
-#include <ApSelect.h>
-#include <ApListItem.h>
-#include "ApSelectorListBoxModel.h"
-#include "ApSettingsHandlerLogger.h"
-
-#include <apsetui.rsg>
-//  TEST ENDS
-
-
-// Stack size of the receiver thread.
-LOCAL_C const TInt KDeleteThreadStackSize = 40960;
-
-// Name of the receiver thread.
-_LIT( KDeleteThreadName, "Access Point Settings UI Delete Operation" );
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::NewL
-// ---------------------------------------------------------
-//
-CApSettingsDeleteOperation* CApSettingsDeleteOperation::NewL(
-                                TInt aNoteControlId,
-                                TInt aResourceID,
-                                TUint32 aUid,
-                                const TDesC& aNoteText
-                                )
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::ConstructL
-// ---------------------------------------------------------
-//
-void CApSettingsDeleteOperation::ConstructL( const TDesC& aNoteText )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::CApSettingsDeleteOperation
-// ---------------------------------------------------------
-//
-CApSettingsDeleteOperation::CApSettingsDeleteOperation(
-                                 TInt aNoteControlId,
-                                 TInt aResourceID,
-                                 TUint32 aUid
-                                 )
-: CActive( EPriorityLow ),
-  iNoteControlId( aNoteControlId ),
-  iResourceID( aResourceID ),
-  iUid( aUid )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::~CApSettingsDeleteOperation
-// ---------------------------------------------------------
-//
-CApSettingsDeleteOperation::~CApSettingsDeleteOperation()
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::RunL
-// ---------------------------------------------------------
-//
-void CApSettingsDeleteOperation::RunL()
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::DoCancel
-// ---------------------------------------------------------
-//
-void CApSettingsDeleteOperation::DoCancel()
-    { // must be here as it is pure virtual in base...    
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::DialogDismissedL
-// ---------------------------------------------------------
-//
-void CApSettingsDeleteOperation::DialogDismissedL( TInt /*aButtonId*/ )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::StartL
-// ---------------------------------------------------------
-//
-void CApSettingsDeleteOperation::StartL()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::Next
-// ---------------------------------------------------------
-//
-void CApSettingsDeleteOperation::Next()
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::RunDeleteThread
-// ---------------------------------------------------------
-//
-TInt CApSettingsDeleteOperation::RunDeleteThread( TAny* aPtr )
-    {
-    return ( 0 );
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::DoRunDeleteThreadL
-// ---------------------------------------------------------
-//
-TInt CApSettingsDeleteOperation::DoRunDeleteThreadL( 
-                                    CApSettingsDeleteOperation* aop )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::StartWaitNoteL
-// ---------------------------------------------------------
-//
-void CApSettingsDeleteOperation::StartWaitNoteL()
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::StartDeleteOperationThreadL
-// ---------------------------------------------------------
-//
-void CApSettingsDeleteOperation::StartDeleteOperationThreadL()
-    {
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::StarTransactionLC
-// ---------------------------------------------------------
-//
-TBool CApSettingsDeleteOperation::StartTransactionLC( CCommsDatabase* aDb,
-                                                      TBool aWrite, 
-                                                      TBool aRetry /*ETrue*/ )
-    {
-    return EFalse;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::GetWriteLockL
-// ---------------------------------------------------------
-//
-void CApSettingsDeleteOperation::GetWriteLockL( CCommsDatabase* aDb )
-    {
-    }
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::RollbackTransactionOnLeave
-// ---------------------------------------------------------
-//
-void CApSettingsDeleteOperation::RollbackTransactionOnLeave( TAny* aDb )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::ReadUintL
-// ---------------------------------------------------------
-//
-TInt CApSettingsDeleteOperation::ReadUintL( CCommsDbTableView* atable,
-                                            const TDesC& aColumn,
-                                            TUint32& aValue )
-    {
-    return KErrNotSupported;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsDeleteOperation::SetNoteTextL
-// ---------------------------------------------------------
-//
-void CApSettingsDeleteOperation::SetNoteTextL( const TDesC& aNoteText )
-    {
-    }
-// End of File
--- a/apengine/apsettingshandlerui/src/apsettingshandlerui.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,584 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Defines the main handler, CApSettingsHandler and public API for 
-*       the Access Point settings.
-*
-*/
-
-
-// INCLUDE FILES
-#include <ActiveApDb.h>
-
-#include "ApSettingsHandlerUI.h"
-#include "ApsettingshandleruiImpl.h"
-#include "ApSettingsHandlerLogger.h"
-#include <data_caging_path_literals.hrh>
-
-
-// UID of general settings app, in which help texts are included
-const   TUid    KHelpUidApSettingsHandler = { 0x100058EC };
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CApSettingsHandler::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApSettingsHandler* CApSettingsHandler::NewLC(
-                                         TBool aStartWithSelection,
-                                         TSelectionListType aListType,
-                                         TSelectionMenuType aSelMenuType,
-                                         TInt aIspFilter,
-                                         TInt aBearerFilter,
-                                         TInt aSortType )
-    {
-    return NULL;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApSettingsHandler* CApSettingsHandler::NewLC(
-                                            CActiveApDb& aDb,
-                                            TBool aStartWithSelection,
-                                            TSelectionListType aListType,
-                                            TSelectionMenuType aSelMenuType,
-                                            TInt aIspFilter,
-                                            TInt aBearerFilter,
-                                            TInt aSortType
-                                            )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApSettingsHandler* CApSettingsHandler::NewLC(
-                                         TBool aStartWithSelection,
-                                         TSelectionListType aListType,
-                                         TSelectionMenuType aSelMenuType,
-                                         TInt aIspFilter,
-                                         TInt aBearerFilter,
-                                         TInt aSortType,
-                                         TInt aReqIpvType
-                                         )
-    {
-    return NULL;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApSettingsHandler* CApSettingsHandler::NewLC(
-                                            CActiveApDb& aDb,
-                                            TBool aStartWithSelection,
-                                            TSelectionListType aListType,
-                                            TSelectionMenuType aSelMenuType,
-                                            TInt aIspFilter,
-                                            TInt aBearerFilter,
-                                            TInt aSortType,
-                                            TInt aReqIpvType
-                                            )
-    {
-    return NULL;
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApSettingsHandler* CApSettingsHandler::NewLC(
-                                        TBool aStartWithSelection,
-                                        TSelectionListType aListType,
-                                        TSelectionMenuType aSelMenuType,
-                                        TInt aIspFilter,
-                                        TInt aBearerFilter,
-                                        TInt aSortType,
-                                        TInt aReqIpvType,
-                                        TVpnFilterType aVpnFilterType
-                                            )
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApSettingsHandler* CApSettingsHandler::NewLC(
-                                            CActiveApDb& aDb,
-                                            TBool aStartWithSelection,
-                                            TSelectionListType aListType,
-                                            TSelectionMenuType aSelMenuType,
-                                            TInt aIspFilter,
-                                            TInt aBearerFilter,
-                                            TInt aSortType,
-                                            TInt aReqIpvType,
-                                            TVpnFilterType aVpnFilterType
-                                            )
-    {
-    return NULL;
-    }
-
-
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApSettingsHandler* CApSettingsHandler::NewLC(
-                                        CActiveApDb& aDb,
-                                        TBool aStartWithSelection,
-                                        TSelectionListType aListType,
-                                        TSelectionMenuType aSelMenuType,
-                                        TInt aIspFilter,
-                                        TInt aBearerFilter,
-                                        TInt aSortType,
-                                        TInt aReqIpvType,
-                                        TVpnFilterType aVpnFilterType,
-                                        TBool aIncludeEasyWlan
-                                        )
-    {
-    return NULL;    
-    }
-
-
-// Destructor
-EXPORT_C CApSettingsHandler::~CApSettingsHandler()
-    {
-    }
-
-
-
-// Constructor
-EXPORT_C CApSettingsHandler::CApSettingsHandler( TBool aStartWithSelection,
-                                                TSelectionListType aListType,
-                                                TSelectionMenuType aSelMenuType
-                                                )
-:iStartWithSelection( aStartWithSelection ),
-iListType( aListType ),
-iSelMenuType( aSelMenuType ),
-iIspFilter( KEApIspTypeAll ),
-iBearerFilter( EApBearerTypeAll ),
-iReqIpvType( EIPv4 ),
-iEventStore( KApUiEventNone )
-    {
-    }
-
-
-
-
-
-// Constructor
-CApSettingsHandler::CApSettingsHandler( TBool aStartWithSelection,
-                                        TSelectionListType aListType,
-                                        TSelectionMenuType aSelMenuType,
-                                        TInt aReqIpvType
-                                        )
-:iStartWithSelection( aStartWithSelection ),
-iListType( aListType ),
-iSelMenuType( aSelMenuType ),
-iIspFilter( KEApIspTypeAll ),
-iBearerFilter( EApBearerTypeAll ),
-iReqIpvType( aReqIpvType ),
-iEventStore( KApUiEventNone )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApSettingsHandler::ConstructL(   TInt aIspFilter,
-                                                TInt aBearerFilter,
-                                                TInt aSortType )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApSettingsHandler::ConstructL(   CActiveApDb& aDb,
-                                                TInt aIspFilter,
-                                                TInt aBearerFilter,
-                                                TInt aSortType )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApSettingsHandler::ConstructL(   
-                                             TInt aIspFilter,
-                                             TInt aBearerFilter,
-                                             TInt aSortType,
-                                             TVpnFilterType aVpnFilterType
-                                            )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApSettingsHandler::ConstructL(
-                                             CActiveApDb& aDb,
-                                             TInt aIspFilter,
-                                             TInt aBearerFilter,
-                                             TInt aSortType,
-                                             TVpnFilterType aVpnFilterType
-                                             )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApSettingsHandler::ConstructL(
-                                        CActiveApDb& aDb,
-                                        TInt aIspFilter,
-                                        TInt aBearerFilter,
-                                        TInt aSortType,
-                                        TVpnFilterType aVpnFilterType,
-                                        TBool aIncludeEasyWlan
-                                        )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::SetFilter
-// ---------------------------------------------------------
-//
-EXPORT_C void CApSettingsHandler::SetFilterL(   TInt aIspFilter,
-                                                TInt aBearerFilter,
-                                                TInt aSortType )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::SetTextOverrideL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApSettingsHandler::SetTextOverrideL( TTextID aText2Change,
-                                                    const TDesC& aNewText )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::TextOverrideL
-// ---------------------------------------------------------
-//
-EXPORT_C const TDesC& CApSettingsHandler::TextOverrideL( TTextID aTextId )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::RunSettingsL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApSettingsHandler::RunSettingsL( TUint32 aHighLight,
-                                                TUint32& aSelected )
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::Cvt()
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApSettingsHandler::Cvt()
-    {
-    return KErrNotSupported;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::DoRunSettingsL
-// ---------------------------------------------------------
-//
-TInt CApSettingsHandler::DoRunSettingsL( TUint32 /*aHighLight*/,
-                                         TUint32& /*aSelected*/ )
-    {
-    User::Leave(KErrNotSupported);
-    return KErrNotSupported;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::RunViewerL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApSettingsHandler::RunViewerL( TUint32 aUid )
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandler::DoRunViewerL
-// ---------------------------------------------------------
-//
-TInt CApSettingsHandler::DoRunViewerL( TUint32 /*aUid*/ )
-    {
-    User::Leave(KErrNotSupported);
-    return KErrNotSupported;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::HandleApDeleteCmdL
-//----------------------------------------------------------
-//
-void CApSettingsHandler::HandleApDeleteCmdL( TUint32 /*aUid*/, 
-                                             TBool /*aIsLast*/ )
-    {
-    User::Leave(KErrNotSupported);
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::HandleApBlankNewL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsHandler::HandleApBlankNewL( TInt /*aBearers*/, 
-                                               TInt /*aIsps*/ )
-    {
-    User::Leave(KErrNotSupported);
-    return KErrNotSupported;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::HandleApUseOldNewL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsHandler::HandleApUseOldNewL()
-    {
-    User::Leave(KErrNotSupported);
-    return KErrNone;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::EditAfterCreateL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsHandler::EditAfterCreateL( TUint32 /*aUid*/,
-                                              CApAccessPointItem* /*aItem*/ )
-    {
-    User::Leave(KErrNotSupported);
-    return KErrNotSupported;  
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::DoConstructL
-//----------------------------------------------------------
-//
-void CApSettingsHandler::DoConstructL( CActiveApDb* aDb,
-                                       TInt aIspFilter,
-                                       TInt aBearerFilter,
-                                       TInt aSortType,
-                                       TVpnFilterType aVpnFilterType,
-                                       TBool aIncludeEasyWlan )
-    {
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::DoRunSetPageSettingsL
-//----------------------------------------------------------
-//
-void CApSettingsHandler::DoRunSetPageSettingsL( TUint32 /*aHighLight*/,
-                                                TUint32& /*aSelected*/ )
-    {
-    User::Leave(KErrNotSupported);
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::DoRunListSettingsL
-//----------------------------------------------------------
-//
-void CApSettingsHandler::DoRunListSettingsL( TUint32 /*aHighLight*/,
-                                             TUint32& /*aSelected*/ )
-    {
-    User::Leave(KErrNotSupported);
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::DoHandleApUseOldNewL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsHandler::DoHandleApUseOldNewL( TUint32 /*aSelected*/ )
-    {
-    User::Leave(KErrNotSupported);
-    return KErrNotSupported;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::SelectApToCopyL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsHandler::SelectApToCopyL()
-    {
-    User::Leave(KErrNotSupported);
-    return KErrNotSupported;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::DoHandleApBlankNewL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsHandler::DoHandleApBlankNewL( TInt /*aBearers*/, TInt /*aIsps*/ )
-    {
-    User::Leave(KErrNotSupported);
-    return KErrNotSupported;
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::HandleNetworkDeleteCmdL
-//----------------------------------------------------------
-//
-void CApSettingsHandler::HandleNetworkDeleteCmdL( TUint32 /*aUid*/ )
-    {
-    User::Leave(KErrNotSupported);
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::GetVariantL
-//----------------------------------------------------------
-//
-TInt CApSettingsHandler::GetVariantL()
-    {
-    User::Leave(KErrNotSupported);
-    return KErrNotSupported;
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::ConfirmDeleteL
-//----------------------------------------------------------
-//
-TInt CApSettingsHandler::ConfirmDeleteL( TUint32 /*aUid*/, TBool /*aIsLast*/ )
-    {
-    User::Leave(KErrNotSupported);
-    return KErrNotSupported;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::HandleRunSettingsL
-//----------------------------------------------------------
-//
-void CApSettingsHandler::HandleRunSettingsL( TUint32 /*aHighLight*/, 
-                                             TUint32& /*aSelected*/ )
-    {
-    User::Leave(KErrNotSupported);
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::ChooseBearerTypeL
-//----------------------------------------------------------
-//
-void CApSettingsHandler::ChooseBearerTypeL( TInt /*aBearers*/, 
-                                            CApAccessPointItem& /*aItem*/ )
-    {
-    User::Leave(KErrNotSupported);
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandler::HandleDuplicateL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsHandler::HandleDuplicateL( TUint32 /*aUid*/ )
-    {
-    User::Leave(KErrNotSupported);
-    return KErrNotSupported;
-    }
-
-
-// End of File
-
--- a/apengine/apsettingshandlerui/src/apsettingshandleruiImpl.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,639 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Defines the main handler, CApSettingsHandlerImpl for 
-*       the Access Point settings.
-*
-*/
-
-
-// INCLUDE FILES
-#include "APSettingsHandlerUIVariant.hrh"
-
-#include <bautils.h>
-#include <StringLoader.h>
-#include <apsetui.rsg>
-#include <ActiveApDb.h>
-
-#include "ApsettingshandleruiImpl.h"
-#include "ApSettingsHandlerUI.hrh"
-#include "ApSelectorDialog.h"
-
-#include "ApSettingsDlg.h"
-
-#include "TextOverrides.h"
-#include "ApSettingsModel.h"
-#include "ApSelPopupList.h"
-#include "ApSelQueryDialog.h"
-
-#include <aknnotedialog.h>
-#include <ApListItemList.h>
-
-#include <f32file.h>
-
-#include "ApSettingsHandlerLogger.h"
-#include <ApSettingsHandlerCommons.h>
-
-
-#include "ApSettingsHandlerUiPrivateCRKeys.h"
-#include <centralrepository.h>
-
-#include <sysutil.h>
-
-#include <ApNetworkItem.h>
-
-#include <featmgr.h>
-#include <VpnApEngine.h>
-
-#include <data_caging_path_literals.hrh>
-
-#include <shareddataclient.h>
-
-// UID of general settings app, in which help texts are included
-const   TUid    KHelpUidApSettingsHandler = { 0x100058EC };
-
-
-//#define __TEST_PERFORMANCE
-/// ROM drive.
-_LIT( KApSettingsResDriveZ, "z:" );
-/// Access point settings handler UI resource file name.
-_LIT( KApSettingsResFileName, "apsetui.rsc" );
-
-
-
-/// Estimated FFS overhead for deleting (in bytes).
-LOCAL_C const TInt KEstimatedDeleteFfsOverhead = 48 * 1024;
-
-
-
-//KFeatureIdIPv6
-// #define KFeatureIdIPv6 KOtherFeatureFirst+88
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::NewLC
-// ---------------------------------------------------------
-//
-CApSettingsHandlerImpl* CApSettingsHandlerImpl::NewLC(
-                                         TBool aStartWithSelection,
-                                         TSelectionListType aListType,
-                                         TSelectionMenuType aSelMenuType,
-                                         TInt aIspFilter,
-                                         TInt aBearerFilter,
-                                         TInt aSortType,
-                                         TBool aNoEdit )
-    {
-    return NULL;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImplImpl::NewLC
-// ---------------------------------------------------------
-//
-CApSettingsHandlerImpl* CApSettingsHandlerImpl::NewLC(
-                                            CActiveApDb& aDb,
-                                            TBool aStartWithSelection,
-                                            TSelectionListType aListType,
-                                            TSelectionMenuType aSelMenuType,
-                                            TInt aIspFilter,
-                                            TInt aBearerFilter,
-                                            TInt aSortType,
-                                            TBool aNoEdit
-                                            )
-    {
-    return NULL;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::NewLC
-// ---------------------------------------------------------
-//
-CApSettingsHandlerImpl* CApSettingsHandlerImpl::NewLC(
-                                         TBool aStartWithSelection,
-                                         TSelectionListType aListType,
-                                         TSelectionMenuType aSelMenuType,
-                                         TInt aIspFilter,
-                                         TInt aBearerFilter,
-                                         TInt aSortType,
-                                         TInt aReqIpvType,
-                                         TBool aNoEdit
-                                         )
-    {
-    return NULL;
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::NewLC
-// ---------------------------------------------------------
-//
-CApSettingsHandlerImpl* CApSettingsHandlerImpl::NewLC(
-                                            CActiveApDb& aDb,
-                                            TBool aStartWithSelection,
-                                            TSelectionListType aListType,
-                                            TSelectionMenuType aSelMenuType,
-                                            TInt aIspFilter,
-                                            TInt aBearerFilter,
-                                            TInt aSortType,
-                                            TInt aReqIpvType,
-                                            TBool aNoEdit
-                                            )
-    {
-    return NULL;
-    }
-
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::NewLC
-// ---------------------------------------------------------
-//
-CApSettingsHandlerImpl* CApSettingsHandlerImpl::NewLC(
-                                        TBool aStartWithSelection,
-                                        TSelectionListType aListType,
-                                        TSelectionMenuType aSelMenuType,
-                                        TInt aIspFilter,
-                                        TInt aBearerFilter,
-                                        TInt aSortType,
-                                        TInt aReqIpvType,
-                                        TVpnFilterType aVpnFilterType,
-                                        TBool aNoEdit
-                                            )
-    {
-    return NULL;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::NewLC
-// ---------------------------------------------------------
-//
-CApSettingsHandlerImpl* CApSettingsHandlerImpl::NewLC(
-                                            CActiveApDb& aDb,
-                                            TBool aStartWithSelection,
-                                            TSelectionListType aListType,
-                                            TSelectionMenuType aSelMenuType,
-                                            TInt aIspFilter,
-                                            TInt aBearerFilter,
-                                            TInt aSortType,
-                                            TInt aReqIpvType,
-                                            TVpnFilterType aVpnFilterType,
-                                            TBool aNoEdit
-                                            )
-    {
-    return NULL;
-    }
-
-
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::NewLC
-// ---------------------------------------------------------
-//
-CApSettingsHandlerImpl* CApSettingsHandlerImpl::NewLC(
-                                        CActiveApDb& aDb,
-                                        TBool aStartWithSelection,
-                                        TSelectionListType aListType,
-                                        TSelectionMenuType aSelMenuType,
-                                        TInt aIspFilter,
-                                        TInt aBearerFilter,
-                                        TInt aSortType,
-                                        TInt aReqIpvType,
-                                        TVpnFilterType aVpnFilterType,
-                                        TBool aIncludeEasyWlan,
-                                        TBool aNoEdit
-                                        )
-    {
-    return NULL;    
-    }
-
-
-
-// Destructor
-CApSettingsHandlerImpl::~CApSettingsHandlerImpl()
-    {
-    }
-
-
-// Constructor
-CApSettingsHandlerImpl::CApSettingsHandlerImpl( TBool aStartWithSelection,
-                                                TSelectionListType aListType,
-                                                TSelectionMenuType aSelMenuType,
-                                                TBool aNoEdit
-                                                )
-:iStartWithSelection( aStartWithSelection ),
-iListType( aListType ),
-iSelMenuType( aSelMenuType ),
-iIspFilter( KEApIspTypeAll ),
-iBearerFilter( EApBearerTypeAll ),
-iReqIpvType( EIPv4 ),
-iEventStore( KApUiEventNone ),
-iNoEdit( aNoEdit )
-    {
-    }
-
-
-
-
-
-// Constructor
-CApSettingsHandlerImpl::CApSettingsHandlerImpl( TBool aStartWithSelection,
-                                        TSelectionListType aListType,
-                                        TSelectionMenuType aSelMenuType,
-                                        TInt aReqIpvType,
-                                        TBool aNoEdit 
-                                        )
-:iStartWithSelection( aStartWithSelection ),
-iListType( aListType ),
-iSelMenuType( aSelMenuType ),
-iIspFilter( KEApIspTypeAll ),
-iBearerFilter( EApBearerTypeAll ),
-iReqIpvType( aReqIpvType ),
-iEventStore( KApUiEventNone ),
-iNoEdit( aNoEdit )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::ConstructL
-// ---------------------------------------------------------
-//
-void CApSettingsHandlerImpl::ConstructL(   TInt aIspFilter,
-                                                TInt aBearerFilter,
-                                                TInt aSortType )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::ConstructL
-// ---------------------------------------------------------
-//
-void CApSettingsHandlerImpl::ConstructL(   CActiveApDb& aDb,
-                                                TInt aIspFilter,
-                                                TInt aBearerFilter,
-                                                TInt aSortType )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::ConstructL
-// ---------------------------------------------------------
-//
-void CApSettingsHandlerImpl::ConstructL(   
-                                             TInt aIspFilter,
-                                             TInt aBearerFilter,
-                                             TInt aSortType,
-                                             TVpnFilterType aVpnFilterType
-                                            )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::ConstructL
-// ---------------------------------------------------------
-//
-void CApSettingsHandlerImpl::ConstructL(
-                                             CActiveApDb& aDb,
-                                             TInt aIspFilter,
-                                             TInt aBearerFilter,
-                                             TInt aSortType,
-                                             TVpnFilterType aVpnFilterType
-                                             )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::ConstructL
-// ---------------------------------------------------------
-//
-void CApSettingsHandlerImpl::ConstructL(
-                                        CActiveApDb& aDb,
-                                        TInt aIspFilter,
-                                        TInt aBearerFilter,
-                                        TInt aSortType,
-                                        TVpnFilterType aVpnFilterType,
-                                        TBool aIncludeEasyWlan
-                                        )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::SetFilter
-// ---------------------------------------------------------
-//
-void CApSettingsHandlerImpl::SetFilterL(   TInt aIspFilter,
-                                                TInt aBearerFilter,
-                                                TInt aSortType )
-    {
-    }
-
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::SetTextOverrideL
-// ---------------------------------------------------------
-//
-void CApSettingsHandlerImpl::SetTextOverrideL( TTextID aText2Change,
-                                                    const TDesC& aNewText )
-    {
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::TextOverrideL
-// ---------------------------------------------------------
-//
-const TDesC& CApSettingsHandlerImpl::TextOverrideL( TTextID aTextId )
-    {
-    User::Leave( KErrNotSupported );
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::RunSettingsL
-// ---------------------------------------------------------
-//
-TInt CApSettingsHandlerImpl::RunSettingsL( TUint32 aHighLight,
-                                                TUint32& aSelected )
-    {    
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::Cvt()
-// ---------------------------------------------------------
-//
-TInt CApSettingsHandlerImpl::Cvt()
-    {
-    return KErrNotSupported;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::DoRunSettingsL
-// ---------------------------------------------------------
-//
-TInt CApSettingsHandlerImpl::DoRunSettingsL( TUint32 aHighLight,
-                                         TUint32& aSelected )
-    {
-    return 0;
-    }
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::RunViewerL
-// ---------------------------------------------------------
-//
-TInt CApSettingsHandlerImpl::RunViewerL( TUint32 aUid )
-    {
-    return 0;
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsHandlerImpl::DoRunViewerL
-// ---------------------------------------------------------
-//
-TInt CApSettingsHandlerImpl::DoRunViewerL( TUint32 aUid )
-    {
-    return 0;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::HandleApDeleteCmdL
-//----------------------------------------------------------
-//
-void CApSettingsHandlerImpl::HandleApDeleteCmdL( TUint32 aUid, TBool aIsLast )
-    {
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::HandleApBlankNewL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsHandlerImpl::HandleApBlankNewL( TInt aBearers, TInt aIsps )
-    {
-    return 0;
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::HandleApUseOldNewL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsHandlerImpl::HandleApUseOldNewL()
-    {
-    return 0;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::EditAfterCreateL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsHandlerImpl::EditAfterCreateL( TUint32 aUid,
-                                              CApAccessPointItem* aItem )
-    {
-    return 0;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::DoConstructL
-//----------------------------------------------------------
-//
-void CApSettingsHandlerImpl::DoConstructL( CActiveApDb* aDb,
-                                       TInt aIspFilter,
-                                       TInt aBearerFilter,
-                                       TInt aSortType,
-                                       TVpnFilterType aVpnFilterType,
-                                       TBool aIncludeEasyWlan )
-    {
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::DoRunSetPageSettingsL
-//----------------------------------------------------------
-//
-void CApSettingsHandlerImpl::DoRunSetPageSettingsL( TUint32 aHighLight,
-                                                TUint32& aSelected )
-    {
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::DoRunListSettingsL
-//----------------------------------------------------------
-//
-void CApSettingsHandlerImpl::DoRunListSettingsL( TUint32 aHighLight,
-                                             TUint32& aSelected )
-    {
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::DoHandleApUseOldNewL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsHandlerImpl::DoHandleApUseOldNewL( TUint32 aSelected )
-    {
-    return KErrNotSupported;
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::SelectApToCopyL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsHandlerImpl::SelectApToCopyL()
-    {
-    return KErrNotSupported;
-    }
-
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::DoHandleApBlankNewL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsHandlerImpl::DoHandleApBlankNewL( TInt aBearers, TInt aIsps )
-    {
-    return 0;
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::HandleNetworkDeleteCmdL
-//----------------------------------------------------------
-//
-void CApSettingsHandlerImpl::HandleNetworkDeleteCmdL( TUint32 aUid )
-    {
-    }
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::GetVariantL
-//----------------------------------------------------------
-//
-TInt CApSettingsHandlerImpl::GetVariantL()
-    {
-    APSETUILOGGER_ENTERFN( EApImpl,"Impl::GetVariantL")
-    
-    TInt variant( 0 );
-    // Connecting and initialization:
-    CRepository* repository = 
-            CRepository::NewL( KCRUidApSettingsHandlerUiLV );
-    repository->Get( KApSettingsHandlerUiLVFlags, variant );
-    delete repository;
-
-    APSETUILOGGER_LEAVEFN( EApImpl,"Impl::GetVariantL")
-    return variant;
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::ConfirmDeleteL
-//----------------------------------------------------------
-//
-TInt CApSettingsHandlerImpl::ConfirmDeleteL( TUint32 aUid, TBool aIsLast )
-    {
-    return 0;
-    }
-
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::HandleRunSettingsL
-//----------------------------------------------------------
-//
-void CApSettingsHandlerImpl::HandleRunSettingsL( TUint32 aHighLight, 
-                                             TUint32& aSelected )
-    {
-    }
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::ChooseBearerTypeL
-//----------------------------------------------------------
-//
-void CApSettingsHandlerImpl::ChooseBearerTypeL( TInt aBearers, 
-                                            CApAccessPointItem& aItem )
-    {
-    }
-
-
-
-
-//----------------------------------------------------------
-// CApSettingsHandlerImpl::HandleDuplicateL
-//----------------------------------------------------------
-//
-TUint32 CApSettingsHandlerImpl::HandleDuplicateL( TUint32 aUid )
-    {
-    return KErrNotSupported;
-    }
-
-
-// End of File
-
--- a/apengine/apsettingshandlerui/src/apsettingsui.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,104 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Defines the handler, CApSettingsUi and oem API for 
-*       the Access Point settings.
-*
-*/
-
-
-// INCLUDE FILES
-
-#include <e32base.h>
-
-#include <ApSettingsHandlerCommons.h>
-#include "apsettingsui.h"
-#include "ApsettingshandleruiImpl.h"
-
-#include "ApSettingsHandlerLogger.h"
-#include <data_caging_path_literals.hrh>
-
-
-// ================= MEMBER FUNCTIONS =======================
-
-// ---------------------------------------------------------
-// CApSettingsUi::NewLC
-// ---------------------------------------------------------
-//
-EXPORT_C CApSettingsUi* CApSettingsUi::NewLC(
-                                        TBool aStartWithSelection,
-                                        TSelectionListType aListType,
-                                        TSelectionMenuType aSelMenuType,
-                                        TInt aIspFilter,
-                                        TInt aBearerFilter,
-                                        TInt aSortType,
-                                        TInt aReqIpvType,
-                                        TVpnFilterType aVpnFilterType
-                                            )
-    {
-    return NULL;
-    }
-
-
-
-// Destructor
-EXPORT_C CApSettingsUi::~CApSettingsUi()
-    {
-    }
-
-
-
-
-// Constructor
-CApSettingsUi::CApSettingsUi( TBool aStartWithSelection,
-                            TSelectionListType aListType,
-                            TSelectionMenuType aSelMenuType,
-                            TInt aReqIpvType )
-:iStartWithSelection( aStartWithSelection ),
-iListType( aListType ),
-iSelMenuType( aSelMenuType ),
-iReqIpvType( aReqIpvType )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsUi::ConstructL
-// ---------------------------------------------------------
-//
-EXPORT_C void CApSettingsUi::ConstructL( TInt aIspFilter,
-                                         TInt aBearerFilter,
-                                         TInt aSortType,
-                                         TVpnFilterType aVpnFilterType
-                                        )
-    {
-    }
-
-
-
-// ---------------------------------------------------------
-// CApSettingsUi::RunSettingsL
-// ---------------------------------------------------------
-//
-EXPORT_C TInt CApSettingsUi::RunSettingsL( TUint32 aHighLight,
-                                                TUint32& aSelected )
-    {
-    return 0;
-    }
-
-
-
-// End of File
-
--- a/apengine/group/bld.inf	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2001-2009 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Build information file
-*
-*/
-
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-PRJ_MMPFILES
-#include "../apeng/group/bld.inf"
-#include "../apsettingshandlerui/group/bld.inf"
-
-PRJ_TESTMMPFILES
\ No newline at end of file
--- a/bearermanagement/S60MCPR/inc/s60mcpr.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/S60MCPR/inc/s60mcpr.h	Wed Oct 27 17:51:11 2010 +0300
@@ -174,6 +174,24 @@
      * Clears handshaking flag. 
      */
     void ClearHandshakingFlag();
+
+    /**
+     * Checking whether the node is in the middle of a gone down error
+     * recovery.
+     * 
+     * @return ETrue if recovering a GoneDown error
+     */
+    TBool IsGoneDownRecoveryOngoing() const;
+    
+    /**
+     * Sets gone down recovery flag. 
+     */
+    void SetGoneDownRecoveryOngoing();
+    
+    /**
+     * Clears gone down recovery flag. 
+     */
+    void ClearGoneDownRecoveryOngoing();    
     
     /**
      * Re-send last received policy notification if it exists.
@@ -262,6 +280,19 @@
     TBool                   iIsHandshakingNow; 
     
     /**
+     * Status flag indicating that we are currently recovering from GoneDown.
+     * This is set while MPM is making recovery decision, and in case of
+     * mobility connections also for the period while the connection roams 
+     * to a new interface. This is used (at least) for erroring NoBearer
+     * requests coming from the data clients.
+     * 
+     * Even though the bit fields are generally quite useless optimization in
+     * this kind of cases, used also in here since there are a couple of
+     * those above...
+     */
+    TBool                   iGoneDownRecoveryOngoing : 1;
+    
+    /**
      * Connection preference list
      */
     ESock::RConnPrefList    iConnPrefList;
--- a/bearermanagement/S60MCPR/inc/s60mcprstates.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/S60MCPR/inc/s60mcprstates.h	Wed Oct 27 17:51:11 2010 +0300
@@ -119,6 +119,17 @@
                               TContext )
     virtual void DoL();
     DECLARE_SMELEMENT_FOOTER( TProcessError )
+
+    /**
+     * TRANSITION/ACTION: Error no bearer request while in gone down recovery.
+     */
+    DECLARE_SMELEMENT_HEADER( THandleNoBearerDuringGoneDownRecovery, 
+                              MeshMachine::TStateTransition<TContext>, 
+                              NetStateMachine::MStateTransition, 
+                              TContext )
+    virtual void DoL();
+    DECLARE_SMELEMENT_FOOTER( THandleNoBearerDuringGoneDownRecovery )
+
     
     /**
      * STATE: Waits for valid select or error message.
@@ -165,6 +176,18 @@
     DECLARE_SMELEMENT_FOOTER( TAwaitingServiceIdRequest )
 
     /**
+     * STATE: Waits for NoBearer request while in gone down recovery. 
+     * @return ETrue if message is accepted. 
+     */
+    DECLARE_SMELEMENT_HEADER( TAwaitingNoBearerInGoneDownRecovery, 
+                              MeshMachine::TState<TContext>, 
+                              NetStateMachine::MState, 
+                              TContext )
+    virtual TBool Accept();
+    DECLARE_SMELEMENT_FOOTER( TAwaitingNoBearerInGoneDownRecovery )
+    
+
+    /**
      * TRANSITION/ACTION: Retrieve ServiceId.
      */
     DECLARE_SMELEMENT_HEADER( TRetrieveServiceId, 
--- a/bearermanagement/S60MCPR/src/s60mcpr.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/S60MCPR/src/s60mcpr.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -68,7 +68,8 @@
                                                         const TProviderInfo& aProviderInfo, 
                                                         const MeshMachine::TNodeActivityMap& aActivityMap )
     :   CMobilityMetaConnectionProvider( aFactory, aProviderInfo, aActivityMap ),
-        iDataClientStatusStarted( EFalse )
+        iDataClientStatusStarted( EFalse ),
+        iGoneDownRecoveryOngoing( EFalse )
     {
     LOG_NODE_CREATE(KS60MCprTag, CS60MetaConnectionProvider);
     }
@@ -283,6 +284,34 @@
     iIsHandshakingNow = EFalse;
     }
 
+// -----------------------------------------------------------------------------
+// CS60MetaConnectionProvider::IsGoneDownRecoveryOngoing
+// -----------------------------------------------------------------------------
+//
+TBool CS60MetaConnectionProvider::IsGoneDownRecoveryOngoing() const
+    {
+    return iGoneDownRecoveryOngoing;
+    }
+
+
+// -----------------------------------------------------------------------------
+// CS60MetaConnectionProvider::SetGoneDownRecoveryOngoing
+// -----------------------------------------------------------------------------
+//
+void CS60MetaConnectionProvider::SetGoneDownRecoveryOngoing()
+    {
+    iGoneDownRecoveryOngoing = ETrue;
+    }
+
+
+// -----------------------------------------------------------------------------
+// CS60MetaConnectionProvider::ClearGoneDownRecoveryOngoing
+// -----------------------------------------------------------------------------
+//
+void CS60MetaConnectionProvider::ClearGoneDownRecoveryOngoing()
+    {
+    iGoneDownRecoveryOngoing = EFalse;
+    }
 
 // -----------------------------------------------------------------------------
 // CS60MetaConnectionProvider::PolicyNotification
--- a/bearermanagement/S60MCPR/src/s60mcpractivities.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/S60MCPR/src/s60mcpractivities.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -433,6 +433,20 @@
     } // S60MCprStopIAPActivity
 
 // -----------------------------------------------------------------------------
+// S60McprNoBearerDuringGoneDownErrorRecovery
+// -----------------------------------------------------------------------------
+//
+namespace S60McprNoBearerDuringGoneDownErrorRecovery
+    {
+    DECLARE_DEFINE_NODEACTIVITY( ECFActivityNoBearer, 
+                                 S60MCprNoBearerDuringGoneDown, 
+                                 TCFControlProvider::TNoBearer )
+    SINGLE_NODEACTIVITY_ENTRY( S60MCprStates::THandleNoBearerDuringGoneDownRecovery, 
+                               S60MCprStates::TAwaitingNoBearerInGoneDownRecovery )
+    NODEACTIVITY_END()
+    }
+	
+// -----------------------------------------------------------------------------
 // S60MCprDataClientIdleActivity
 // -----------------------------------------------------------------------------
 //
@@ -487,6 +501,7 @@
     ACTIVITY_MAP_ENTRY(S60MCprMobilityActivity, MCprMobility) // in s60mcprmobilityactivity.cpp
     ACTIVITY_MAP_ENTRY(S60MCprConnectionGoneDownRecoveryActivity, MCprConnectionGoneDownRecovery)
     ACTIVITY_MAP_ENTRY(S60MCprServiceIdRMessage2HandlerActivity, S60MCprServiceIdLegacyRMessage2Handler)
+    ACTIVITY_MAP_ENTRY(S60McprNoBearerDuringGoneDownErrorRecovery, S60MCprNoBearerDuringGoneDown)
     ACTIVITY_MAP_ENTRY(S60MCprStopIAPActivity, MCprStopIAPActivity)
     ACTIVITY_MAP_ENTRY(S60MCprDataClientIdleActivity, MCprDataClientIdleActivity)
     ACTIVITY_MAP_END_BASE(MobilityMCprActivities, mobilityMCprActivities)
--- a/bearermanagement/S60MCPR/src/s60mcprerrorrecoveryactivity.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/S60MCPR/src/s60mcprerrorrecoveryactivity.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -113,6 +113,31 @@
             iContext.iNodeActivity->SetError( KErrGeneral );
             }
 
+#ifdef _DEBUG
+        // Purely for debugging purposes
+        CS60MetaConnectionProvider& node = (CS60MetaConnectionProvider&)iContext.Node();
+        if ( node.IsGoneDownRecoveryOngoing() )
+            {
+            // This transition is done in both connection start recovery and in
+            // gone down recovery. If we are running gone down recovery, there
+            // are two possible options what can happen next:
+            // 1) If we are running mobility activity, the error can be ignored
+            //    if there is another carrier available. In this case MPM will
+            //    send a preffered carrier available soon after.
+            // 2) In all other cases, the only way forward is error propagation
+            //    (see gone down activity for further info). In this case, the
+            //    gone down error is sent to clients and connection will be 
+            //    teared down.
+            //
+            // In both cases, the GoneDownRecoveryOngoing flag is not cleared.
+            // For case 1) above, it will be cleared after the connection has
+            // roamed, and for option 2) it is pretty much irrelevant (we can
+            // probably avoid a couple of race conditions by leaving the flag
+            // active for the time being.
+            S60MCPRLOGSTRING1("S60MCPR<%x>::TNoTagOrIgnoreErrorOrErrorTag::TransitionTag() MPM response while GoneDown recovery active",(TInt*)&iContext.Node());
+            }
+#endif
+        
         // Error transition
         //
         if ( !msg )
--- a/bearermanagement/S60MCPR/src/s60mcprmobilityactivity.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/S60MCPR/src/s60mcprmobilityactivity.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -361,6 +361,30 @@
         activity.PostToOriginators(msg);
         activity.ClearPostedTo();
         activity.SetHandshakingFlag();
+        
+        
+#ifdef _DEBUG
+        // Purely for debugging purposes
+        CS60MetaConnectionProvider& node = (CS60MetaConnectionProvider&)iContext.Node();
+        if ( node.IsGoneDownRecoveryOngoing() )
+            {
+            S60MCPRLOGSTRING1("S60MCPR<%x>::TInformMigrationAvailableAndSetHandshakingFlag::DoL() Start mobility handshake while gone down recovery is active",(TInt*)&iContext.Node())
+            // During the handshake, there is four different paths that 
+            // needs to be considered for reseting the gone down recovery
+            // flag. These are:
+            // 1) Migration is done successfully
+            // 2) Application rejects the migration
+            // 3) While migrating, a new preferred carrier is found       
+            // 4) Operation is cancelled or an error occurs
+            //
+            // For 1) and 2) the flag needs to be reset, where as for 3) we
+            // can keep the flag set until the "loop" is exited with a valid
+            // reselection (essentially this will be same as 1) but only
+            // after a couple of retrials). For the last option 4) the
+            // connection is tear down and reseting the flag is not needed.
+            }
+#endif
+        
         }
 
     
@@ -377,6 +401,15 @@
         CS60MetaConnectionProvider& node = (CS60MetaConnectionProvider&)iContext.Node();
         CS60MobilityActivity& activity = static_cast<CS60MobilityActivity&>(*iContext.iNodeActivity);
         node.Policy()->ApplicationIgnoredTheCarrierL( activity.iPreferredAPId );
+        if (node.IsGoneDownRecoveryOngoing() )
+            {
+            // Too bad... Old link has gone down, and application rejected
+            // the new one. Nothing but problems ahead, but who cares, if
+            // the application doesn't. So reset the gone down recovery flag
+            // and assume that everybody is happy with the choise.
+            S60MCPRLOGSTRING1("S60MCPR<%x>::TSendMigrationRejected::DoL() Application rejected the carrier during gone down recovery -> reset flag",(TInt*)&iContext.Node())
+            node.ClearGoneDownRecoveryOngoing();
+            }
         }
 
 
@@ -453,6 +486,15 @@
         {
         S60MCPRLOGSTRING1("S60MCPR<%x>::TInformMigrationCompleted::DoL()",(TInt*)&iContext.Node())
         __ASSERT_DEBUG(iContext.iNodeActivity, User::Panic(KS60MCprPanic, KPanicNoActivity));
+        CS60MetaConnectionProvider& node = (CS60MetaConnectionProvider&)iContext.Node();
+        if ( node.IsGoneDownRecoveryOngoing() )
+            {
+            // Now we are on a safe side, since the reselect has been done
+            // IPCPr can and will complete NoBearer requests to the new
+            // interface instead of the old one. Reset the flag.
+            S60MCPRLOGSTRING1("S60MCPR<%x>::TInformMigrationCompleted::DoL() New bearer selected while in gone down recovery -> reset flag",(TInt*)&iContext.Node())
+            node.ClearGoneDownRecoveryOngoing();
+            }
         iContext.iNodeActivity->PostToOriginators(TCFMobilityProvider::TMigrationComplete().CRef());
         iContext.iNodeActivity->ClearPostedTo();
         }
@@ -475,6 +517,16 @@
         // 
         CS60MobilityActivity& activity = static_cast<CS60MobilityActivity&>(*iContext.iNodeActivity);
         activity.ClearHandshakingFlag();
+        
+        if ( node.IsGoneDownRecoveryOngoing() )
+            {
+            // Migration either errored or was cancelled while in gone down
+            // recovery. Node will be destroyed, so there is no point in
+            // such, but reset the flag anyway..
+            S60MCPRLOGSTRING1("S60MCPR<%x>::TCancelAvailabilityRequest::DoL() Error in migration while in gone down recovery -> reset flag",(TInt*)&iContext.Node())
+            node.ClearGoneDownRecoveryOngoing();
+            }
+        
         // At last we must set the activity in error since we're ready to go down.
         //
         iContext.iNodeActivity->SetError( KErrCancel );
--- a/bearermanagement/S60MCPR/src/s60mcprstates.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/S60MCPR/src/s60mcprstates.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -214,6 +214,19 @@
 
     ASSERT( error != KErrNone );
     
+    // Special handling for GoneDown errors. In this phase it is necessary
+    // to make sure that we are actually in GoneDown recovery, not in 
+    // start recovery. So check activity instead of error code
+    if (iContext.iNodeActivity->ActivityId() == ECFActivityConnectionGoneDownRecovery)
+        {
+        // We are requesting error recovery from MPM for GoneDown error
+        // Set the flag indicating that lower layer is not in a valid state
+        // so that we can discard NoBearer request coming from data clients
+        // for the time being.
+        S60MCPRLOGSTRING1("S60MCPR<%x>::TProcessError::DoL() Setting GoneDown recovery flag",(TInt*)&iContext.Node())
+        node.SetGoneDownRecoveryOngoing();
+        }    
+    
     // Create the callback that will eventually create the message that completes this state.
     CProcessErrorCb* cb = new( ELeave ) CProcessErrorCb( node, iContext.iNodeActivity );  // codescanner::leave
     CleanupStack::PushL( cb );  // codescanner::leave
@@ -223,6 +236,20 @@
     // After this we wait for cancellation/error/completion.
     }
 
+// -----------------------------------------------------------------------------
+// THandleNoBearerDuringGoneDownRecovery::DoL
+// -----------------------------------------------------------------------------
+//
+DEFINE_SMELEMENT( THandleNoBearerDuringGoneDownRecovery, NetStateMachine::MStateTransition, TContext )
+void THandleNoBearerDuringGoneDownRecovery::DoL() // codescanner::leave
+    { 
+    // As this is a single triple activity, there is no real activity
+    // instance available. Therefore, we need to live with the info
+    // available in the context.
+    S60MCPRLOGSTRING1("S60MCPR<%x>::THandleNoBearerDuringGoneDownRecovery::DoL() Return error",(TInt*)&iContext.Node())
+    TEBase::TError errorMsg ( iContext.iMessage.MessageId(), KErrNotReady );
+    iContext.PostToSender( errorMsg );
+    }
 
 // -----------------------------------------------------------------------------
 // TAwaitingSelectNextLayerCompletedOrError::Accept
@@ -515,6 +542,28 @@
     }
 
 // -----------------------------------------------------------------------------
+// TAwaitingNoBearerInGoneDownRecovery::Accept
+// -----------------------------------------------------------------------------
+//
+DEFINE_SMELEMENT( TAwaitingNoBearerInGoneDownRecovery, NetStateMachine::MState, TContext )
+TBool TAwaitingNoBearerInGoneDownRecovery::Accept()
+    {
+    if ( iContext.iMessage.IsMessage<TCFControlProvider::TNoBearer>() )
+        {
+        // Get MCPR to check gone down flag status 
+        CS60MetaConnectionProvider& node = (CS60MetaConnectionProvider&)iContext.Node();
+        if ( node.IsGoneDownRecoveryOngoing() )
+            {
+            // We have received a NoBearer while recovering from a GoneDown error
+            // Needs special handling -> accept
+            S60MCPRLOGSTRING1("S60MCPR<%x>::TAwaitingNoBearerInGoneDownRecovery::Accept() return true", (TInt*)&iContext.Node())
+            return ETrue;
+            }
+        }
+    return EFalse;
+    }
+
+// -----------------------------------------------------------------------------
 // TRetrieveServiceId::DoL
 // -----------------------------------------------------------------------------
 //
--- a/bearermanagement/mpm/group/mpmserver.mmp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/group/mpmserver.mmp	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -36,6 +36,7 @@
 SOURCEPATH        ../src
 SOURCE            mpmconnmonevents.cpp
 SOURCE            mpmconnmonreqs.cpp
+SOURCE            mpmscheduler.cpp
 SOURCE            mpmserversession.cpp
 SOURCE            mpmserver.cpp
 SOURCE            mpmstarter.cpp
--- a/bearermanagement/mpm/inc/mpmconfirmdlg.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmconfirmdlg.h	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -111,7 +111,7 @@
         */
         void ConstructL();
 
-    private: // from CActive
+    protected: // from CActive
 
         /**
         * Active Object RunL.
@@ -120,6 +120,13 @@
         void RunL();
 
         /**
+        * Handles a leave occurring in RunL.
+        * @param aError Leave code of RunL method.
+        * @return KErrNone
+        */
+        TInt RunError( TInt aError );
+
+        /**
         * Active Object DoCancel.
         * @since 3.2
         */
--- a/bearermanagement/mpm/inc/mpmcsidwatcher.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmcsidwatcher.h	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -39,8 +39,8 @@
     static CMpmCsIdWatcher* NewL();
 
     /**
-    * Destructor.
-    */
+     * Destructor.
+     */
     virtual ~CMpmCsIdWatcher();
 
     /**
@@ -56,10 +56,23 @@
      */
     TUint32 ConnectScreenId() const;
     
-// from base class CActive
+protected: // from base class CActive
 
+    /**
+     * Active object's RunL.
+     */
     void RunL();
 
+    /**
+     * Handles a leave occurring in RunL.
+     * @param aError Leave code of RunL method.
+     * @return KErrNone
+     */
+    TInt RunError( TInt aError );
+
+    /**
+     * Active object's DoCancel.
+     */
     void DoCancel();
 
 private:
--- a/bearermanagement/mpm/inc/mpmdatausagewatcher.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmdatausagewatcher.h	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -48,25 +48,34 @@
     virtual ~CMpmDataUsageWatcher();
 
     /**
-     * Start to listen for events.
-     */
+    * Start to listen for events.
+    */
     void StartL();
-    
+
+    /**
+    * Current cellular data usage.
+    * See TCmCellularDataUsage
+    */
+    TInt CellularDataUsage() const;
+
+protected: // from CActive
+
     /**
     * Active object's RunL.
     */
     void RunL();
 
     /**
+    * Handles a leave occurring in RunL.
+    * @param aError Leave code of RunL method.
+    * @return KErrNone
+    */
+    TInt RunError( TInt aError );
+
+    /**
     * Active object's DoCancel.
     */
     void DoCancel();
-    
-    /**
-    * Current cellular data usage.
-    * See TCmCellularDataUsage
-    */
-    TInt CellularDataUsage() const;
 
 private:
 
--- a/bearermanagement/mpm/inc/mpmdialogbase.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmdialogbase.h	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2009-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -76,7 +76,7 @@
      * @param aError Error that caused leave.
      * @return KErrNone
      */
-    virtual TInt RunError( TInt aError ) { return CActive::RunError( aError ); }
+    virtual TInt RunError( TInt aError ) = 0;
 
     /**
      * Called automatically from the Base class implementation.
--- a/bearermanagement/mpm/inc/mpmdtmwatcher.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmdtmwatcher.h	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2007 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -74,6 +74,13 @@
         */
         void RunL();
 
+        /**
+        * Handles a leave occurring in RunL.
+        * @param aError Leave code of RunL method.
+        * @return KErrNone
+        */
+        TInt RunError( TInt aError );
+
     private: // New methods
 
         /**
--- a/bearermanagement/mpm/inc/mpmlogger.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmlogger.h	Wed Oct 27 17:51:11 2010 +0300
@@ -138,4 +138,4 @@
 
 #endif // MPMLOGGER_H
 
-// End of File
\ No newline at end of file
+// End of File
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bearermanagement/mpm/inc/mpmscheduler.h	Wed Oct 27 17:51:11 2010 +0300
@@ -0,0 +1,81 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Active scheduler for MPM server.
+*
+*/
+
+#ifndef MPMSCHEDULER_H
+#define MPMSCHEDULER_H
+
+#include <e32base.h>
+
+/**
+ * Mobility Policy Manager active scheduler. Required to override the default
+ * error handling from CActiveScheduler.
+ */
+NONSHARABLE_CLASS( CMpmScheduler ) : public CActiveScheduler
+    {
+public:
+    /**
+     * NewL.
+     */
+    static CMpmScheduler* NewL();
+
+    /**
+     * NewLC.
+     */
+    static CMpmScheduler* NewLC();
+
+    /**
+     * Destructor.
+     */
+    virtual ~CMpmScheduler();
+
+private:
+    /**
+     * Constructor.
+     */
+    CMpmScheduler();
+
+    /**
+     * 2nd level constructor.
+     */
+    void ConstructL();
+
+public:
+    /**
+     * Set the MPM server.
+     * @param aMpmServer Pointer to the MPM server.
+     */
+    void SetMpmServer( CServer2* aMpmServer );
+
+    /**
+     * Error handling for the active scheduler.
+     * Handles any leave occuring in an active object's RunL() function that
+     * hasn't been properly handled in the active object's own RunError()
+     * function.
+     * @param aError Leave code from active object.
+     */
+    void Error( TInt aError ) const;
+
+private:
+    /**
+     * Pointer to the MPM server.
+     */
+    CServer2* iMpmServer; // Not owned
+    };
+
+#endif // MPMSCHEDULER_H
+
+// End of file
--- a/bearermanagement/mpm/inc/mpmserver.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmserver.h	Wed Oct 27 17:51:11 2010 +0300
@@ -671,6 +671,13 @@
         static TInt StartForcedRoamingToConnectedWlanL( TAny* aUpdater );
         
         /**
+        * Send preferred IAP notification for each session
+        * 
+        * @since 5.2
+        */       
+        void SendPrefIAPNotificationL();
+        
+        /**
         * Starts forced roaming sequence from WLAN if necessary
         *
         * @param aIapInfo Info about available IAPs
@@ -1013,7 +1020,10 @@
         TConnMonIapInfo iConnMonIapInfo;
         
         // Connection permission query cancellation delay timer
-        CMPMConnPermQueryTimer* iConnPermQueryTimer;
+        CMPMConnPermQueryTimer* iConnPermQueryTimer;        
+        
+        // Component which initiated sending preferred IAP notifications
+        TPrefIAPNotifCaller iCaller;
     };
 
 #include "mpmserver.inl"
--- a/bearermanagement/mpm/inc/mpmvpntogglewatcher.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/inc/mpmvpntogglewatcher.h	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -34,14 +34,14 @@
 class MMpmVpnToggleWatcherNotify
 {
 public:
-    
+
     /**
      * Sets values for VPN toggle after VPN toggle key changes in central
      * repository.
      * @param aVpnPreferred Informs if VPN connection is preferred
      *                      connection
      * @param aVpnIapId VPN IAP Id, which is used for VPN connection, when
-     *                  VPN connection is preferred                           
+     *                  VPN connection is preferred
      * @param aSnapId SNAP Id SNAP Id, which is used for VPN connection,
      *                when VPN connection is preferred
      */
@@ -62,94 +62,107 @@
     /**
     * Two-phased constructor.
     * @param aNotify Handler for notify messages.
-    */    
+    */
     static CMpmVpnToggleWatcher* NewL( MMpmVpnToggleWatcherNotify& aNotify );
 
     /**
     * Destructor.
     */
     virtual ~CMpmVpnToggleWatcher();
-    
+
     /**
      * Call this when you want to start listen event.
      */
-    void StartL();    
-        
+    void StartL();
+
     /**
      * Informs if VPN connection is preferred.
      * @return True if VPN connection is preferred.
      */
     TBool IsVpnConnectionPreferred() const;
-    
+
     /**
      * Returns VPN IAP Id, which is used for VPN connection, when VPN
      * connection is preferred.
      * @return VPN IAP Id
      */
     TUint32 VpnIapId() const;
-    
+
     /**
      * Returns SNAP Id, which is used for VPN connection, when VPN
      * connection is preferred.
      * @return SNAP Id
      */
-    TUint32 SnapId() const;    
-    
+    TUint32 SnapId() const;
+
     /**
      * Resets VPN toggle values.
-     */    
+     */
     void ResetVpnToggleValues();
-    
+
 private:
 
     CMpmVpnToggleWatcher( MMpmVpnToggleWatcherNotify& aNotify );
 
     void ConstructL();
-    
+
     /**
      * Request for notifications.
      * @return Error value
      */
     TInt RequestNotifications();
-    
+
     /**
      * Gets VPN toggle values.
      * @return Error value
      */
     TInt GetVpnToggleValues();
 
-// from base class CActive
+protected: // from base class CActive
 
+    /**
+     * Active object's RunL.
+     */
     void RunL();
 
+    /**
+     * Handles a leave occurring in RunL.
+     * @param aError Leave code of RunL method.
+     * @return KErrNone
+     */
+    TInt RunError( TInt aError );
+
+    /**
+     * Active object's DoCancel.
+     */
     void DoCancel();
-    
+
 private: // data
-    
+
     /**
      * Central repository handle
      * Own.
      */
-    CRepository* iRepository;    
-    
+    CRepository* iRepository;
+
     /**
      * Informs if VPN connection is preferred connection
      * Own.
      */
     TBool iVpnConnectionPreferred;
-    
+
     /**
      * VPN IAP Id which is used, when VPN connection is preferred
      * Own.
      */
     TUint32 iVpnIapId;
-    
+
     /**
      * SNAP Id which is used, when VPN connection is preferred
      * Own.
      */
     TUint32 iSnapId;
-    
+
     /**
      * Error counter.
      */
@@ -160,7 +173,7 @@
      * Not own.
      */
     MMpmVpnToggleWatcherNotify& iNotify;
-    
+
     };
 
 #endif // MPMVPNTOGGLEWATCHER_H
--- a/bearermanagement/mpm/src/mpmconfirmdlg.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/src/mpmconfirmdlg.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2006-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2006-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -147,6 +147,17 @@
     }
 
 // -----------------------------------------------------------------------------
+// CMPMConfirmDlg::RunError
+// -----------------------------------------------------------------------------
+//
+TInt CMPMConfirmDlg::RunError( TInt aError )
+    {
+    MPMLOGSTRING2( "CMPMConfirmDlg::RunError, ERROR: %d", aError )
+    aError = aError;
+    return KErrNone;
+    }
+
+// -----------------------------------------------------------------------------
 // CMPMConfirmDlg::DoCancel
 // -----------------------------------------------------------------------------
 //
--- a/bearermanagement/mpm/src/mpmconnmonevents.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/src/mpmconnmonevents.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -542,7 +542,7 @@
             }
         default:
             {
-            MPMLOGSTRING( "CMPMConnMonEvents::RunL: default" )
+            MPMLOGSTRING( "CMPMConnMonEvents::EventL: default" )
             break;
             }
         }
--- a/bearermanagement/mpm/src/mpmcsidwatcher.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/src/mpmcsidwatcher.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -151,6 +151,23 @@
 
 // ---------------------------------------------------------------------------
 // From class CActive.
+// Handles any leave from RunL.
+// ---------------------------------------------------------------------------
+//
+TInt CMpmCsIdWatcher::RunError( TInt aError )
+    {
+    MPMLOGSTRING2( "CMpmCsIdWatcher::RunError, ERROR: %d", aError );
+    aError = aError;
+    iErrorCounter++;
+    if ( !IsActive() )
+        {
+        RequestNotifications();
+        }
+    return KErrNone;
+    }
+
+// ---------------------------------------------------------------------------
+// From class CActive.
 // Cancel outstanding request
 // ---------------------------------------------------------------------------
 //
--- a/bearermanagement/mpm/src/mpmdatausagewatcher.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/src/mpmdatausagewatcher.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2008-2009 Nokia Corporation and/or its subsidiary(-ies). 
+ * Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
  * All rights reserved.
  * This component and the accompanying materials are made available
  * under the terms of "Eclipse Public License v1.0"
@@ -135,6 +135,23 @@
 
 // ---------------------------------------------------------------------------
 // From class CActive.
+// Handles any leave from RunL.
+// ---------------------------------------------------------------------------
+//
+TInt CMpmDataUsageWatcher::RunError( TInt aError )
+    {
+    MPMLOGSTRING2( "CMpmDataUsageWatcher::RunError, ERROR: %d", aError );
+    aError = aError;
+    iErrorCounter++;
+    if ( !IsActive() )
+        {
+        RequestNotifications();
+        }
+    return KErrNone;
+    }
+
+// ---------------------------------------------------------------------------
+// From class CActive.
 // Cancel outstanding request.
 // ---------------------------------------------------------------------------
 //
--- a/bearermanagement/mpm/src/mpmdialogbase.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/src/mpmdialogbase.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2008 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -114,4 +114,16 @@
         }
     }
 
+// -----------------------------------------------------------------------------
+// CMPMDialog::RunError
+// Default implementation will cause the Error() function from active scheduler
+// to be executed.
+// -----------------------------------------------------------------------------
+//
+TInt CMPMDialogBase::RunError( TInt aError )
+    {
+    MPMLOGSTRING2( "CMPMDialogBase::RunError, ERROR: %d", aError )
+    return aError;
+    }
+
 //  End of File
--- a/bearermanagement/mpm/src/mpmdtmwatcher.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/src/mpmdtmwatcher.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2005 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2005-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -128,6 +128,18 @@
 
 
 // -----------------------------------------------------------------------------
+// CMPMDtmWatcher::RunError
+// -----------------------------------------------------------------------------
+//
+TInt CMPMDtmWatcher::RunError( TInt aError )
+    {
+    MPMLOGSTRING2( "CMPMDtmWatcher::RunError, ERROR: %d", aError );
+    aError = aError;
+    return KErrNone;
+    }
+
+
+// -----------------------------------------------------------------------------
 // CMPMDtmWatcher::DoCancel
 // -----------------------------------------------------------------------------
 //
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/bearermanagement/mpm/src/mpmscheduler.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -0,0 +1,100 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description: Active scheduler for MPM server.
+*
+*/
+
+#include "mpmscheduler.h"
+#include "mpmlogger.h"
+
+// ---------------------------------------------------------------------------
+// Two phased construction.
+// ---------------------------------------------------------------------------
+//
+CMpmScheduler* CMpmScheduler::NewL()
+    {
+    CMpmScheduler* self = CMpmScheduler::NewLC();
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+// ---------------------------------------------------------------------------
+// Two phased construction.
+// ---------------------------------------------------------------------------
+//
+CMpmScheduler* CMpmScheduler::NewLC()
+    {
+    CMpmScheduler* self = new( ELeave ) CMpmScheduler();
+    CleanupStack::PushL( self );
+    self->ConstructL();
+    return self;
+    }
+
+// ---------------------------------------------------------------------------
+// Destructor.
+// ---------------------------------------------------------------------------
+//
+CMpmScheduler::~CMpmScheduler()
+    {
+    }
+
+// ---------------------------------------------------------------------------
+// Constructor.
+// ---------------------------------------------------------------------------
+//
+CMpmScheduler::CMpmScheduler() : iMpmServer( NULL )
+    {
+    }
+
+// ---------------------------------------------------------------------------
+// Second phase constructor.
+// ---------------------------------------------------------------------------
+//
+void CMpmScheduler::ConstructL()
+    {
+    }
+
+// ---------------------------------------------------------------------------
+// Set the MPM server pointer. Used to restart the server in error situation
+// if needed.
+// ---------------------------------------------------------------------------
+//
+void CMpmScheduler::SetMpmServer( CServer2* aMpmServer )
+    {
+    iMpmServer = aMpmServer;
+    }
+
+// ---------------------------------------------------------------------------
+// Error handling for the active scheduler.
+// Handles any leave occuring in an active object's RunL() function that hasn't
+// been properly handled in the active object's own RunError() function.
+//
+// All active objects in MPM server should handle their own error situations.
+// If execution ends up here, there is a problem in the originating active
+// object RunL() function and the problem should be fixed there. 
+// ---------------------------------------------------------------------------
+//
+void CMpmScheduler::Error( TInt aError ) const
+    {
+    MPMLOGSTRING2( "CMpmScheduler::Error, ERROR: %d", aError )
+    aError = aError;
+
+    // Restart server if not active.
+    if ( iMpmServer && !iMpmServer->IsActive() )
+        {
+        iMpmServer->ReStart();
+        }
+    }
+
+// End of file
--- a/bearermanagement/mpm/src/mpmserver.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/src/mpmserver.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -905,6 +905,7 @@
     MPMLOGSTRING2( "CMPMServer::NotifyBMPrefIapL - IAPs count: %d", 
         aIapInfo.iCount)
     TConnMonIapInfo iapInfo = aIapInfo;
+    iCaller = aCaller;
     
 #ifdef _DEBUG
     for (TUint i = 0; i < iapInfo.Count(); i++)
@@ -947,15 +948,8 @@
         StartForcedRoamingFromWlanL( iapInfo );
         }
     
-    MPMLOGSTRING2(
-    "CMPMServer::NotifyBMPrefIapL - Send notifications for %d sessions", 
-        iSessions.Count() )
-
-    for ( TInt i = 0; i < iSessions.Count(); i++ )
-        {
-        iapInfo = iSessions[i]->GetAvailableIAPs( );
-        iSessions[i]->PrefIAPNotificationL( iapInfo, aCaller );
-        }
+    // Send notifications for all sessions
+      SendPrefIAPNotificationL();
     }
 
 
@@ -1554,8 +1548,21 @@
 TInt CMPMServer::StartForcedRoamingToConnectedWlanL( TAny* aUpdater )
     {
     MPMLOGSTRING( "CMPMServer::StartForcedRoamingToConnectedWlanL" );
-    TRAPD( error, static_cast<CMPMServer*>( aUpdater )->StartForcedRoamingToWlanL( 
-           static_cast<CMPMServer*>( aUpdater )->iConnMonIapInfo ) )
+    CMPMServer* self = static_cast<CMPMServer*>( aUpdater );
+    
+    // If IAP availability change was received when connection
+    // was in starting state, then roaming to WLAN didnot happen
+    // at that stage. So, send preferred IAP notification again 
+    // after WLAN is connected. 
+    //
+    TRAPD( err, self->SendPrefIAPNotificationL() );
+    if ( err )
+        {           
+        MPMLOGSTRING2("CMPMServer::StartForcedRoamingToConnectedWlan error = %d, ", err )
+        return 0;
+        }
+    
+    TRAPD( error, self->StartForcedRoamingToWlanL( self->iConnMonIapInfo ) )
     if ( error )
         {        	
         MPMLOGSTRING2("CMPMServer::StartForcedRoamingToConnectedWlan error1 = %d, ", error )
@@ -1565,8 +1572,7 @@
     // Added also execution of policy based roaming logic because
     // connections that are in EStarting state, when WLAN signal
     // gets weak, would remain in WLAN as long as signal is weak. 
-    TRAP( error, static_cast<CMPMServer*>( aUpdater )->StartForcedRoamingFromWlanL(
-          static_cast<CMPMServer*>( aUpdater )->iConnMonIapInfo ) )
+    TRAP( error, self->StartForcedRoamingFromWlanL( self->iConnMonIapInfo ) )
     if ( error )
         {        	
         MPMLOGSTRING2("CMPMServer::StartForcedRoamingToConnectedWlan error2 = %d, ", error )
@@ -1575,6 +1581,25 @@
     return 0;
     }
 
+// ---------------------------------------------------------------------------
+// CMPMServer::SendPrefIAPNotificationL
+// ---------------------------------------------------------------------------
+//    
+
+void CMPMServer::SendPrefIAPNotificationL()
+    {
+    MPMLOGSTRING( "CMPMServer::SendPrefIAPNotificationL" )
+            
+    MPMLOGSTRING2(
+     "CMPMServer::SendPrefIAPNotificationL - Send notifications for %d sessions", 
+         iSessions.Count() )
+    
+     for ( TInt i = 0; i < iSessions.Count(); i++ )
+         {
+         TConnMonIapInfo iapInfo = iSessions[i]->GetAvailableIAPs( );
+         iSessions[i]->PrefIAPNotificationL( iapInfo, iCaller );
+         }
+    }
 
 // -----------------------------------------------------------------------------
 // CMPMServer::StartForcedRoamingFromWlanL
--- a/bearermanagement/mpm/src/mpmserversession.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/src/mpmserversession.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,7 +24,6 @@
 #include <e32svr.h>
 #include <gsmerror.h>     // KErrPacketDataTsyMaxPdpContextsReached 
 #include <etelpckt.h>     // KErrUmtsMaxNumOfContextExceededByNetwork
-#include <bldvariant.hrh>                // For feature flags
 #include <centralrepository.h>           // CRepository 
 #include <CoreApplicationUIsSDKCRKeys.h> // KCRUidCoreApplicationUIs, 
                                          // KCoreAppUIsNetworkConnectionAllowed
@@ -96,7 +95,7 @@
     MPMLOGSTRING( "CMPMServerSession::ConstructL" )
     if ( !iMyServer.Events() )
         {
-        iMyServer.SetEvents(CMPMConnMonEvents::NewL(
+        iMyServer.SetEvents( CMPMConnMonEvents::NewL(
             *const_cast<CMPMServer*>( &iMyServer ) ) );
         }
 
@@ -547,7 +546,7 @@
                 // TODO Change CancelScanL to non-leaving.
                 // Otherwise, nothing clever can be done here.
                 // And OOM may risk MPM stability.
-                TRAP_IGNORE( iMyServer.Events()->CancelScanL( this ))
+                TRAP_IGNORE( iMyServer.Events()->CancelScanL( this ) )
                 iServerSortSNAPMessage.Complete( KErrCancel );
                 }
             break;
@@ -3257,7 +3256,6 @@
     {
     MPMLOGSTRING2( "CMPMServerSession::ChooseIapComplete aError = %d", aError )
 
-    
     // Try to write back arguments and complete message.
     // 
     if ( !iChooseIapMessage.IsNull() )
@@ -3357,9 +3355,6 @@
     if ( !iProcessErrorMessage.IsNull() )
         {
         // Try to write back arguments and complete message.
-        // Traps are not necesary here. If WriteL functions leave the
-        // message is still completed in ServiceError
-        //
         if( aErrorReturned )
             {
             MPMLOGSTRING2( "CMPMServerSession::ProcessErrorComplete returned error = %d", 
@@ -3448,8 +3443,8 @@
 //
 TBool CMPMServerSession::UseUserConnPref()
     {
-    if ((iAppUid != iMyServer.CsIdWatcher()->ConnectScreenId()) &&
-        iMyServer.UserConnection())
+    if ( ( iAppUid != iMyServer.CsIdWatcher()->ConnectScreenId() ) &&
+         iMyServer.UserConnection() )
         {
         MPMLOGSTRING( "CMPMServerSession::UseUserConnPref - User connection active" );
         
--- a/bearermanagement/mpm/src/mpmstarter.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/src/mpmstarter.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2004-2005 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2004-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -24,6 +24,7 @@
 #include <e32svr.h>
 
 #include "mpmstarter.h"
+#include "mpmscheduler.h"
 #include "mpmserver.h"
 #include "mpmlogger.h"
 
@@ -37,14 +38,14 @@
 static void RunServerL()
     {
     MPMLOGSTRING( "MPMStarter::RunServerL" )
-    // create and install the active scheduler we need
-    CActiveScheduler* s=new( ELeave ) CActiveScheduler;
-    CleanupStack::PushL( s );
-    CActiveScheduler::Install( s );
-    //
-    // create the server
+    // Create and install the active scheduler
+    CMpmScheduler* scheduler = CMpmScheduler::NewLC();
+    CActiveScheduler::Install( scheduler );
+
+    // Create the server
     CServer2* server = MPMStarter::CreateAndStartServerL();
     CleanupStack::PushL( server );
+    scheduler->SetMpmServer( server );
 
     User::LeaveIfError( RThread::RenameMe( MPMStarter::ServerName() ) );
 
@@ -53,10 +54,10 @@
 
     // Ready to run
     CActiveScheduler::Start();
-    //
+
     // Cleanup the server and scheduler
     CleanupStack::PopAndDestroy( server );
-    CleanupStack::PopAndDestroy( s );
+    CleanupStack::PopAndDestroy( scheduler );
     }
 
 
--- a/bearermanagement/mpm/src/mpmvpntogglewatcher.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/bearermanagement/mpm/src/mpmvpntogglewatcher.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies). 
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -28,7 +28,7 @@
     : CActive( EPriorityStandard ),
       iNotify( aNotify )
     {
-    CActiveScheduler::Add( this );    
+    CActiveScheduler::Add( this );
     }
 
 
@@ -63,7 +63,7 @@
 // ---------------------------------------------------------------------------
 //
 CMpmVpnToggleWatcher::~CMpmVpnToggleWatcher()
-    {    
+    {
     Cancel();
     delete iRepository;
     }
@@ -75,7 +75,7 @@
 void CMpmVpnToggleWatcher::StartL()
     {
     MPMLOGSTRING( "CMpmVpnToggleWatcher::StartL" )
-            
+
     // Get the initial Connect screen ID from repository.
     User::LeaveIfError( GetVpnToggleValues() );
 
@@ -92,7 +92,7 @@
     MPMLOGSTRING( "CMpmVpnToggleWatcher::RequestNotifications" )
 
     TInt err = iRepository->NotifyRequest( KMpmVpnTogglePreferVpn, iStatus );
-        
+
     if ( err == KErrNone )
         {
         SetActive();
@@ -111,29 +111,29 @@
 TInt CMpmVpnToggleWatcher::GetVpnToggleValues()
     {
     MPMLOGSTRING( "CMpmVpnToggleWatcher::GetVpnToggleValues" )
-            
-    // Get values from central repository    
+
+    // Get values from central repository
     TInt err = iRepository->Get( KMpmVpnTogglePreferVpn, iVpnConnectionPreferred );
     if ( err != KErrNone )
         {
-        MPMLOGSTRING2( "CMpmVpnToggleWatcher::GetVpnToggleValues, preferred value, ERROR: %d", err )    
+        MPMLOGSTRING2( "CMpmVpnToggleWatcher::GetVpnToggleValues, preferred value, ERROR: %d", err )
         return err;
-        }    
-    TInt value(0);    
+        }
+    TInt value(0);
     err = iRepository->Get( KMpmVpnToggleIapId, value );
     if ( err != KErrNone )
         {
         MPMLOGSTRING2( "CMpmVpnToggleWatcher::GetVpnToggleValues, IAP Id value, ERROR: %d", err )
         return err;
-        }    
-    iVpnIapId = value;   
+        }
+    iVpnIapId = value;
     err = iRepository->Get( KMpmVpnToggleSnapId, value );
     if ( err != KErrNone )
         {
         MPMLOGSTRING2( "CMpmVpnToggleWatcher::GetVpnToggleValues, SNAP Id value, ERROR: %d", err )
         return err;
         }
-    iSnapId = value;        
+    iSnapId = value;
     return KErrNone;
     }
 
@@ -177,9 +177,9 @@
     iVpnConnectionPreferred = EFalse;
     iVpnIapId = 0;
     iSnapId = 0;
-    
+
     TInt err = iRepository->Set( KMpmVpnTogglePreferVpn, 0 );
-    if ( err == KErrNone ) 
+    if ( err == KErrNone )
         {
         err = iRepository->Set( KMpmVpnToggleIapId, 0 );
         }
@@ -187,9 +187,9 @@
         {
         err = iRepository->Set( KMpmVpnToggleSnapId, 0 );
         }
-    
+
     MPMLOGSTRING2( "CMpmVpnToggleWatcher::ResetVpnToggleValues, ERROR: %d", err )
-    
+
     // Restart listening VPN toggle value change
     RequestNotifications();
     }
@@ -200,7 +200,7 @@
 // ---------------------------------------------------------------------------
 //
 void CMpmVpnToggleWatcher::RunL()
-    {            
+    {
     if ( iStatus.Int() < KErrNone )
         {
         MPMLOGSTRING2("CMpmVpnToggleWatcher::RunL, status: 0x%08X", iStatus.Int())
@@ -218,17 +218,34 @@
         {
         // Notification is received ok => Reset the counter.
         iErrorCounter = 0;
-    
+
         RequestNotifications();
-        
+
         // Get values from central repository
         GetVpnToggleValues();
-        
+
         // Notify values.
         TRAP_IGNORE( iNotify.SetVpnToggleValuesL( iVpnConnectionPreferred,
                                                   iVpnIapId,
-                                                  iSnapId ) );        
-        }    
+                                                  iSnapId ) );
+        }
+    }
+
+// ---------------------------------------------------------------------------
+// From class CActive.
+// Handles any leave from RunL.
+// ---------------------------------------------------------------------------
+//
+TInt CMpmVpnToggleWatcher::RunError( TInt aError )
+    {
+    MPMLOGSTRING2( "CMpmVpnToggleWatcher::RunError, ERROR: %d", aError );
+    aError = aError;
+    iErrorCounter++;
+    if ( !IsActive() )
+        {
+        RequestNotifications();
+        }
+    return KErrNone;
     }
 
 // ---------------------------------------------------------------------------
--- a/connectionmonitoring/connmon/connectionmonitor/BWINSCW/CONNMON_EKA2U.def	Wed Oct 27 17:43:56 2010 +0300
+++ b/connectionmonitoring/connmon/connectionmonitor/BWINSCW/CONNMON_EKA2U.def	Wed Oct 27 17:51:11 2010 +0300
@@ -99,4 +99,5 @@
 	?IsProtectedSetupSupported@CConnMonWlanNetwork@@QAEHXZ @ 98 NONAME ; int CConnMonWlanNetwork::IsProtectedSetupSupported(void)
 	??0TConnMonIapInfo@@QAE@ABV0@@Z @ 99 NONAME ; TConnMonIapInfo::TConnMonIapInfo(class TConnMonIapInfo const &)
 	??4TConnMonIapInfo@@QAEAAV0@ABV0@@Z @ 100 NONAME ; class TConnMonIapInfo & TConnMonIapInfo::operator=(class TConnMonIapInfo const &)
+	?SetBoolAttribute@RConnectionMonitor@@QBEXIIIHAAVTRequestStatus@@@Z @ 101 NONAME ; void RConnectionMonitor::SetBoolAttribute(unsigned int, unsigned int, unsigned int, int, class TRequestStatus &) const
 
--- a/connectionmonitoring/connmon/connectionmonitor/EABI/ConnMon_EKA2U.def	Wed Oct 27 17:43:56 2010 +0300
+++ b/connectionmonitoring/connmon/connectionmonitor/EABI/ConnMon_EKA2U.def	Wed Oct 27 17:51:11 2010 +0300
@@ -164,4 +164,5 @@
 	_ZN15TConnMonIapInfoC1ERKS_ @ 163 NONAME
 	_ZN15TConnMonIapInfoC2ERKS_ @ 164 NONAME
 	_ZN15TConnMonIapInfoaSERKS_ @ 165 NONAME
+	_ZNK18RConnectionMonitor16SetBoolAttributeEjjjiR14TRequestStatus @ 166 NONAME
 
--- a/connectionmonitoring/connmon/connectionmonitor/group/ConnMon.mmp	Wed Oct 27 17:43:56 2010 +0300
+++ b/connectionmonitoring/connmon/connectionmonitor/group/ConnMon.mmp	Wed Oct 27 17:51:11 2010 +0300
@@ -58,6 +58,7 @@
 SOURCE          ConnMonBearerNotifier.cpp ConnMonEGprsNotifier.cpp ConnMonHsdpaNotifier.cpp
 SOURCE          cellulardatausagekeyupdater.cpp
 SOURCE          connmondialupoverridenotifier.cpp
+SOURCE          connmonasyncstopdaemon.cpp
 
 
 USERINCLUDE     ../inc
--- a/connectionmonitoring/connmon/connectionmonitor/inc/CPsdFax.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/connectionmonitoring/connmon/connectionmonitor/inc/CPsdFax.h	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -144,12 +144,32 @@
         TInt GetStartTime( const TUint aConnectionId, TTime& aTime );
 
         /**
-        * Stops the external connection.
+        * Stops the external connection. (Synchronous version)
         * @since
         * @param aConnectionId The connection ID of the PSD connection.
         * @return KErrNone if successfull, otherwise a system wide error code.
         */
         TInt Stop( const TUint aConnectionId );
+        
+        /**
+        * Stops the external connection. (Asynchronous version)
+        *
+        * @param aConnectionId The connection ID of the PSD connection.
+        * @param aStatus KErrNone if successful, a system-wide error code if not.
+        * @return KErrNone if connection ID is valid, KErrNotFound otherwise.
+        */
+        TInt Stop( const TUint aConnectionId, TRequestStatus& aStatus );
+
+        /**
+        * If the stopped connection is still in the connection info array and
+        * connection status notifier isn't running, removes the obsolete
+        * information and notifiers from the connection info array.
+        *
+        * @param aConnectionId The connection ID of the PSD connection.
+        * @return KErrNotFound if connection matching the given ID is not found,
+        * KErrNone otherwise.
+        */
+        TInt CleanupConnectionInfo( const TUint aConnectionId );
 
          /**
         * Delete connections allocated recources.
@@ -284,6 +304,21 @@
         * @return KErrNone if successfull, otherwise a system wide error code.
         */
         TInt Stop();
+        
+        /**
+        * Stops the external connection (asynchronous).
+        * @param aStatus KErrNone if successful, a system-wide error code if not.
+        * @return void.
+        */
+        void Stop( TRequestStatus& aStatus );
+
+        /**
+        * Cleans up connection related objects and table entries if the status
+        * notifier is not running. If status notifier is running, cleanup will
+        * be triggered by connection specific 'context status deleted'-event.
+        * @return void.
+        */
+        void CleanupConnectionInfo();
 
         /**
         * Removes connection from server tables.
--- a/connectionmonitoring/connmon/connectionmonitor/inc/ConnMonIAP.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/connectionmonitoring/connmon/connectionmonitor/inc/ConnMonIAP.h	Wed Oct 27 17:51:11 2010 +0300
@@ -61,6 +61,37 @@
 const TInt KConnMonSmallBufferLen = 30;
 const TInt KBitsInByte = 8;
 const TInt KAttributeParameterIndex = 3;
+const TInt KMaxConnectionCount = 16;
+
+// Used to track async stop thread status for a connection
+enum TConnMonAsyncStopStatus
+    {
+    EConnMonAsyncStopNotStarted = 0, // Async stop has not been requested
+    EConnMonAsyncStopStarted,        // Stop thread is running
+    EConnMonStopCompleted            // Connection has been stopped (sync. or async.)
+    };
+
+
+/**
+ * TAsyncStopQueueElement
+ * Object to hold async. connection stop request related information.
+ */
+NONSHARABLE_CLASS( TAsyncStopQueueElement )
+    {
+public:
+    TAsyncStopQueueElement( const RMessage2& aMessage );
+    /**
+     * Add a connection ID to the ID array. Does nothing if the array is already full. 
+     */
+    void Add( TUint aConnectionId );
+
+public:
+    RMessage2 iMessage;             // Client message that will be completed when stop is done.
+    TInt iStatus;                   // Error status for the stop operation
+    TInt iIdCount;                  // Number of connections to be stopped
+    TInt iStopCount;                // Number of stopped connections
+    TUint iId[KMaxConnectionCount]; // IDs of connections to be stopped
+    };
 
 /**
 * TConnInfo
@@ -126,6 +157,9 @@
 
         // BearerInfo/BearerGroup notifier
         CConnMonBearerNotifier* iBearerNotifier;
+        
+        // Status flag to track status of possible async. stop request
+        TConnMonAsyncStopStatus iAsyncStopStatus;
     };
 
 /**
@@ -239,6 +273,58 @@
          * @return KErrNone if successfull, otherwise a system wide error code.
          */
         TInt SetBoolAttribute( const RMessage2& aMessage );
+        
+        /**
+         * Stops a connection asynchronously.
+         *
+         * @param aMessage Reference to client message, containing the attribute information.
+         * @return KRequestPending, KErrNone or a system wide error code.
+         */
+        TInt AsyncConnectionStopL( const RMessage2& aMessage );
+
+        /**
+         * Stops all connections asynchronously.
+         *
+         * @param aMessage Reference to client message, containing the attribute information.
+         * @return KRequestPending, KErrNone or a system wide error code.
+         */
+        TInt AsyncConnectionStopAllL( const RMessage2& aMessage );
+
+        /**
+         * Starts a new thread to asynchronously stop a specific connection.
+         *
+         * @param aIndex Index number of the connection in internal connection array.
+         * @return KErrNone if successfull, otherwise a system wide error code.
+         */
+        TInt StartAsyncStopThreadL( TInt aIndex );
+
+        /**
+         * Completes any asynchronous connection stop requests that are ready,
+         * and verifies that the connection and its notifiers are cleaned up.
+         *
+         * @param aConnectionId ID of the connection that was stopped.
+         * @param aError Error status for the connection stop operation.
+         * @return void.
+         */
+        void CompleteAsyncStopReqs( const TUint aConnectionId, const TInt aError );
+
+        /**
+         * If the stopped connection is still in the connection info array and
+         * connection up/down notifier isn't running, removes the obsolete
+         * information and notifiers from the connection info array.
+         *
+         * @param aConnectionId ID of the connection to be cleaned.
+         * @return KErrNone if successfull, otherwise a system wide error code.
+         */
+        TInt CleanupConnectionInfo( const TUint& aConnectionId );
+
+        /**
+         * Cancels all asynchronous connection stop request for a specific client.
+         *
+         * @param aSession Pointer to the session, used for identification.
+         * @return void.
+         */
+        void CancelAsyncStopReqs( CSession2* aSession );
 
         /**
          * Sets a String attribute.
@@ -909,6 +995,9 @@
 
         // DTM status watcher.
         CConnMonDtmNotifier* iDualTransferModeNotifier;
+        
+        // Array for holding async. connection stop requests
+        RArray<TAsyncStopQueueElement> iAsyncStopQueue;
     };
 
 #endif // CONNMONIAP_H
--- a/connectionmonitoring/connmon/connectionmonitor/inc/ConnMonServ.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/connectionmonitoring/connmon/connectionmonitor/inc/ConnMonServ.h	Wed Oct 27 17:51:11 2010 +0300
@@ -23,7 +23,7 @@
 _LIT( KConnMonStartupSemaphore, "ConnMonStartupSemaphore" );
 
 // Security policy
-const TUint KConnMonPolicyRangeCount = 11;
+const TUint KConnMonPolicyRangeCount = 12;
 
 const TInt KConnMonPolicyRanges[KConnMonPolicyRangeCount] =
     {
@@ -33,7 +33,8 @@
     13,  //range is 13
     14,  //range is 14
     15,  //range is 15
-    16,  //range is 16-499 inclusive
+    16,  //range is 16
+    17,  //range is 17-499 inclusive
     500, //range is 500-507 inclusive
     508, //range is 508-599 inclusive
     600, //range is 600-601 inclusive
@@ -70,9 +71,12 @@
     CPolicyServer::EAlwaysPass,     // Applies to  5th range (request number: 15)
                                             //EReqCancelReceiveEvent
 
-    CPolicyServer::ENotSupported,   // Applies to  6th range (request number: 16-499)
+    CPolicyServer::ECustomCheck,    // Applies to  6th range (request number: 16)
+                                            //EReqSetAsyncBoolAttribute
 
-    4,                              // Applies to  7th range (request number: 500-507)
+    CPolicyServer::ENotSupported,   // Applies to  7th range (request number: 17-499)
+
+    4,                              // Applies to  8th range (request number: 500-507)
                                             //EReqPluginCreateSubSession
                                             //EReqPluginCloseSubSession
                                             //EReqPluginRegisterAttribute
@@ -82,14 +86,14 @@
                                             //EReqPluginCancelGetQuery
                                             //EReqPluginAttribute
 
-    CPolicyServer::ENotSupported,    // Applies to  8th range (request number: 508-599)
+    CPolicyServer::ENotSupported,    // Applies to  9th range (request number: 508-599)
 
-    CPolicyServer::ENotSupported,    // Applies to  9th range (request number: 600-601)
+    CPolicyServer::ENotSupported,    // Applies to  10th range (request number: 600-601)
                                      // Used internally in communicating with plugin
                                             //EReqInternalSetThreshold
                                             //EReqInternalResetThreshold
 
-    CPolicyServer::ENotSupported     // Applies to 10th range (request number: 602-KMaxTInt)
+    CPolicyServer::ENotSupported     // Applies to 11th range (request number: 602-KMaxTInt)
     };
 
 const CPolicyServer::TPolicyElement KConnMonPolicyElements[] =
--- a/connectionmonitoring/connmon/connectionmonitor/inc/ConnMonSess.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/connectionmonitoring/connmon/connectionmonitor/inc/ConnMonSess.h	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -347,6 +347,14 @@
     TInt SetBoolAttribute();
 
     /**
+     * Sets the TBool attribute asynchronously to the server (KConnectionStop
+     * & KConnectionStopAll).
+     * @return KRequestPending if request initiated successfully, otherwise a
+     * system wide error code.
+     */
+    TInt SetAsyncBoolAttributeL();
+
+    /**
      * Sets the String attribute to the server.
      * @return KErrNone if successfull, otherwise a system wide error code.
      */
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/connectionmonitoring/connmon/connectionmonitor/inc/connmonasyncstopdaemon.h	Wed Oct 27 17:51:11 2010 +0300
@@ -0,0 +1,94 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Active object that starts a connection stop operation in a new
+*               thread and waits for it to complete.
+*/
+
+#ifndef CONNMONASYNCSTOPDAEMON_H
+#define CONNMONASYNCSTOPDAEMON_H
+
+class CConnMonIAP;
+class CPsdFax;
+
+const TInt KCmESockMessageSlots = 4;
+const TInt KCmStopThreadStackSize = 1024;
+
+NONSHARABLE_CLASS( TAsyncStopThreadData )
+    {
+public:
+    TAsyncStopThreadData( TUint32 aIapId, TUint32 aNetId );
+
+public:
+    TUint32 iIapId;
+    TUint32 iNetId;
+
+    TInt iStep;      // Indicates location if error occurs. 
+    TInt iErrorCode; // Error code that occured at location indicated by iStep.
+    };
+
+
+/**
+ * Method to stop a connection in a separate thread. 
+ */
+TInt ConnectionStopThreadFunction( TAny *aPtr );
+
+
+NONSHARABLE_CLASS( CConnMonAsyncStopDaemon ) : public CActive
+    {
+private:
+    enum TConnMonStopType
+        {
+        EConnMonStopTypeUnknown = 0,
+        EConnMonStopTypeInternal,    // Stoped with RConnection handle
+        EConnMonStopTypeExternalPsd, // Stopped through CPsdFax-class
+        EConnMonStopTypeExternalCsd  // Stopped through CCsdFax-class
+        };
+
+public:
+    static CConnMonAsyncStopDaemon* NewL( CConnMonIAP* aIap );
+    static CConnMonAsyncStopDaemon* NewLC( CConnMonIAP* aIap );
+    virtual ~CConnMonAsyncStopDaemon();
+
+private:
+    CConnMonAsyncStopDaemon( CConnMonIAP* aIap );
+    void Construct();
+
+public:
+    /**
+     * Starts the asynchronous stop task for an internal connection. This is
+     * executed in a separate thread.
+     */
+    TInt Start( TUint aConnectionId, TUint32 aIapId, TUint32 aNetId );
+
+    /**
+     * Starts the asynchronous stop task for an external connection. This is
+     * executed as a normal asunchronous request.
+     */
+    TInt Start( const TUint aConnectionId, CPsdFax* aPsdFax );
+
+private: // Methods from base class
+    void DoCancel();
+    void RunL();
+
+private:
+    CConnMonIAP* iIap;           // Not owned
+    CPsdFax* iPsdFax;            // Not owned
+    TAsyncStopThreadData* iData; // Owned
+    TConnMonStopType iConnectionType;
+    TUint iConnectionId;
+    };
+
+#endif // CONNMONASYNCSTOPDAEMON_H
+
+// End of file
--- a/connectionmonitoring/connmon/connectionmonitor/src/CPsdFax.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/connectionmonitoring/connmon/connectionmonitor/src/CPsdFax.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -441,7 +441,7 @@
 
 
 // -----------------------------------------------------------------------------
-// CPsdFax::Stop
+// CPsdFax::Stop (sync)
 // -----------------------------------------------------------------------------
 //
 TInt CPsdFax::Stop( const TUint aConnectionId )
@@ -466,6 +466,55 @@
     return err;
     }
 
+// -----------------------------------------------------------------------------
+// CPsdFax::Stop (async)
+// -----------------------------------------------------------------------------
+//
+TInt CPsdFax::Stop( const TUint aConnectionId, TRequestStatus& aStatus )
+    {
+    LOGENTRFN("CPsdFax::Stop(TUint, TRequestStatus)")
+    TInt err( KErrNone );
+
+    // Check if connection ID is valid and connection is open
+    TInt index = ConnectionIndex( aConnectionId );
+    if ( index == KErrNotFound || !iConnectionData[index]->IsOpen() )
+        {
+        LOGIT1("CPsdFax::Stop() connection not found, index %d", index)
+        err = KErrNotFound;
+        }
+    else
+        {
+        // Stop connection
+        iConnectionData[index]->Stop( aStatus );
+        }
+
+    LOGEXITFN1("CPsdFax::Stop(TUint, TRequestStatus)", err)
+    return err;
+    }
+
+// -----------------------------------------------------------------------------
+// CPsdFax::CleanupConnectionInfo
+// -----------------------------------------------------------------------------
+//
+TInt CPsdFax::CleanupConnectionInfo( const TUint aConnectionId )
+    {
+    LOGENTRFN("CPsdFax::CleanupConnectionInfo()")
+    TInt err( KErrNone );
+
+    TInt index = ConnectionIndex( aConnectionId );
+    if ( index != KErrNotFound )
+        {
+        iConnectionData[index]->CleanupConnectionInfo();
+        }
+    else
+        {
+        LOGIT1("CleanupConnectionInfo: connection ID %d not found", aConnectionId)
+        err = KErrNotFound;
+        }
+
+    LOGEXITFN1("CPsdFax::CleanupConnectionInfo()", err)
+    return err;
+    }
 
 // -----------------------------------------------------------------------------
 // CPsdFax::DeleteConnections
@@ -836,7 +885,7 @@
     }
 
 // -----------------------------------------------------------------------------
-// CPsdFaxConnectionData::Stop
+// CPsdFaxConnectionData::Stop (sync)
 // -----------------------------------------------------------------------------
 //
 TInt CPsdFaxConnectionData::Stop()
@@ -871,6 +920,43 @@
     }
 
 // -----------------------------------------------------------------------------
+// CPsdFaxConnectionData::Stop (async)
+// -----------------------------------------------------------------------------
+//
+void CPsdFaxConnectionData::Stop( TRequestStatus& aStatus )
+    {
+    LOGENTRFN("CPsdFaxConnectionData::Stop(TRequestStatus)")
+    iContext.Deactivate( aStatus );
+    LOGEXITFN("CPsdFaxConnectionData::Stop(TRequestStatus)")
+    }
+
+// -----------------------------------------------------------------------------
+// CPsdFaxConnectionData::CleanupConnectionInfo
+// -----------------------------------------------------------------------------
+//
+void CPsdFaxConnectionData::CleanupConnectionInfo()
+    {
+    LOGENTRFN("CPsdFaxConnectionData::CleanupConnectionInfo()")
+
+    // Remove from server tables if status notifier is not active.
+    if ( iStatusNotifier && !iStatusNotifier->IsActive() )
+        {
+        // Remove from server tables
+        RemoveFromServer();
+
+        // Close the context
+        CloseContext();
+
+        // Delete all old connection objects. This method should be used
+        // carefully because it will delete ConnectionData and statusnotifier
+        // objects. Get out fast from Stop()
+        iFaxModule->DeleteConnections();
+        }
+
+    LOGEXITFN("CPsdFaxConnectionData::CleanupConnectionInfo()")
+    }
+
+// -----------------------------------------------------------------------------
 // CPsdFaxConnectionData::RemoveFromServer
 // -----------------------------------------------------------------------------
 //
--- a/connectionmonitoring/connmon/connectionmonitor/src/ConnMonCli.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/connectionmonitoring/connmon/connectionmonitor/src/ConnMonCli.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -145,12 +145,12 @@
         switch ( iEventInfo.iEventType )
             {
             case EConnMonCreateConnection :
-                iConnMonEvent = new (ELeave) CConnMonCreateConnection(
+                iConnMonEvent = new CConnMonCreateConnection(
                         iEventInfo.iConnectionId );
                 break;
 
             case EConnMonDeleteConnection :
-                iConnMonEvent = new (ELeave) CConnMonDeleteConnection(
+                iConnMonEvent = new CConnMonDeleteConnection(
                         iEventInfo.iConnectionId,
                         iEventInfo.iData,
                         iEventInfo.iData2,
@@ -158,109 +158,109 @@
                 break;
 
             case EConnMonDownlinkDataThreshold :
-                iConnMonEvent = new (ELeave) CConnMonDownlinkDataThreshold(
+                iConnMonEvent = new CConnMonDownlinkDataThreshold(
                         iEventInfo.iConnectionId,
                         iEventInfo.iSubConnectionId,
                         iEventInfo.iData );
                 break;
 
             case EConnMonUplinkDataThreshold :
-                iConnMonEvent = new (ELeave) CConnMonUplinkDataThreshold(
+                iConnMonEvent = new CConnMonUplinkDataThreshold(
                         iEventInfo.iConnectionId,
                         iEventInfo.iSubConnectionId,
                         iEventInfo.iData );
                 break;
 
             case EConnMonNetworkStatusChange :
-                iConnMonEvent = new (ELeave) CConnMonNetworkStatusChange(
+                iConnMonEvent = new CConnMonNetworkStatusChange(
                         iEventInfo.iConnectionId,
                         iEventInfo.iData );
                 break;
 
             case EConnMonConnectionStatusChange :
-                iConnMonEvent = new (ELeave) CConnMonConnectionStatusChange(
+                iConnMonEvent = new CConnMonConnectionStatusChange(
                         iEventInfo.iConnectionId,
                         iEventInfo.iSubConnectionId,
                         iEventInfo.iData );
                 break;
 
             case EConnMonConnectionActivityChange :
-                iConnMonEvent = new (ELeave) CConnMonConnectionActivityChange(
+                iConnMonEvent = new CConnMonConnectionActivityChange(
                         iEventInfo.iConnectionId,
                         iEventInfo.iSubConnectionId,
                         iEventInfo.iData );
                 break;
 
             case EConnMonNetworkRegistrationChange :
-                iConnMonEvent = new (ELeave) CConnMonNetworkRegistrationChange(
+                iConnMonEvent = new CConnMonNetworkRegistrationChange(
                         iEventInfo.iConnectionId,
                         iEventInfo.iData );
                 break;
 
             case EConnMonBearerChange :
-                iConnMonEvent = new (ELeave) CConnMonBearerChange(
+                iConnMonEvent = new CConnMonBearerChange(
                         iEventInfo.iConnectionId,
                         iEventInfo.iData );
                 break;
 
             case EConnMonSignalStrengthChange :
-                iConnMonEvent = new (ELeave) CConnMonSignalStrengthChange(
+                iConnMonEvent = new CConnMonSignalStrengthChange(
                         iEventInfo.iConnectionId,
                         iEventInfo.iData );
                 break;
 
             case EConnMonBearerAvailabilityChange :
-                iConnMonEvent = new (ELeave) CConnMonBearerAvailabilityChange(
+                iConnMonEvent = new CConnMonBearerAvailabilityChange(
                         iEventInfo.iConnectionId,
                         iEventInfo.iData );
                 break;
 
             case EConnMonIapAvailabilityChange :
-                iConnMonEvent = new (ELeave) CConnMonIapAvailabilityChange(
+                iConnMonEvent = new CConnMonIapAvailabilityChange(
                         iEventInfo.iConnectionId,
                         reinterpret_cast<const TConnMonIapInfo*>( iExtraBuf.Ptr() ) );
                 break;
 
             case EConnMonTransmitPowerChange :
-                iConnMonEvent = new (ELeave) CConnMonTransmitPowerChange(
+                iConnMonEvent = new CConnMonTransmitPowerChange(
                         iEventInfo.iConnectionId,
                         iEventInfo.iData );
                 break;
 
             case EConnMonSNAPsAvailabilityChange :
-                iConnMonEvent = new (ELeave) CConnMonSNAPsAvailabilityChange(
+                iConnMonEvent = new CConnMonSNAPsAvailabilityChange(
                         iEventInfo.iConnectionId, iEventInfo.iData,
                         reinterpret_cast< const TConnMonSNAPInfo* >( iExtraBuf.Ptr() ) );
                 break;
 
             case EConnMonNewWLANNetworkDetected :
-                iConnMonEvent = new (ELeave) CConnMonNewWLANNetworkDetected(
+                iConnMonEvent = new CConnMonNewWLANNetworkDetected(
                         iEventInfo.iConnectionId );
                 break;
 
             case EConnMonOldWLANNetworkLost :
-                iConnMonEvent = new (ELeave) CConnMonOldWLANNetworkLost(
+                iConnMonEvent = new CConnMonOldWLANNetworkLost(
                         iEventInfo.iConnectionId );
                 break;
 
             case EConnMonPacketDataUnavailable :
-                iConnMonEvent = new (ELeave) CConnMonPacketDataUnavailable(
+                iConnMonEvent = new CConnMonPacketDataUnavailable(
                         iEventInfo.iConnectionId );
                 break;
 
             case EConnMonPacketDataAvailable :
-                iConnMonEvent = new (ELeave) CConnMonPacketDataAvailable(
+                iConnMonEvent = new CConnMonPacketDataAvailable(
                         iEventInfo.iConnectionId );
                 break;
 
             case EConnMonBearerInfoChange :
-                iConnMonEvent = new (ELeave) CConnMonBearerInfoChange(
+                iConnMonEvent = new CConnMonBearerInfoChange(
                         iEventInfo.iConnectionId,
                         iEventInfo.iData );
                 break;
 
             case EConnMonBearerGroupChange :
-                iConnMonEvent = new (ELeave) CConnMonBearerGroupChange(
+                iConnMonEvent = new CConnMonBearerGroupChange(
                         iEventInfo.iConnectionId,
                         iEventInfo.iData2,
                         iEventInfo.iData3,
@@ -271,43 +271,50 @@
                 if ( iEventInfo.iEventType >= EConnMonPluginEventBase )
                     {
                     // Size of the data is in 'iEventInfo.iData2'
-                    iConnMonEvent = new (ELeave) CConnMonGenericEvent(
+                    iConnMonEvent = new CConnMonGenericEvent(
                             iEventInfo.iEventType,
                             iEventInfo.iConnectionId,
                             reinterpret_cast<TAny*>( &( iEventInfo.iData ) ) );
                     }
                 else
                     {
-                    iConnMonEvent = new (ELeave) CConnMonEventBase(
+                    iConnMonEvent = new CConnMonEventBase(
                             iEventInfo.iEventType,
                             iEventInfo.iConnectionId );
                     }
             }
 
         // Deliver the event to client handler
-        TRAPD( leaveCode,
-                iObserver->EventL( reinterpret_cast<CConnMonEventBase&>( *iConnMonEvent ) ) );
-
-        delete iConnMonEvent;
-        iConnMonEvent = NULL;
+        if ( iConnMonEvent )
+            {
+            TRAPD( leaveCode,
+                   iObserver->EventL( reinterpret_cast<CConnMonEventBase&>( *iConnMonEvent ) ) );
 
-        LOGIT6("Client [%d]: GOT EVENT: type %d, id %d, data1 %d, data2 %d, data3 %d",
-                &iSession,
-                iEventInfo.iEventType,
-                iEventInfo.iConnectionId,
-                iEventInfo.iData,
-                iEventInfo.iData2,
-                iEventInfo.iData3 )
+            delete iConnMonEvent;
+            iConnMonEvent = NULL;
+                   
+            LOGIT6("Client [%d]: GOT EVENT: type %d, id %d, data1 %d, data2 %d, data3 %d",
+                    &iSession,
+                    iEventInfo.iEventType,
+                    iEventInfo.iConnectionId,
+                    iEventInfo.iData,
+                    iEventInfo.iData2,
+                    iEventInfo.iData3 )
+            
+            // If leave occurs in EventL, log and ignore
+            if ( leaveCode )
+                {
+                LOGIT2("Client [%d]: CConnMonEventHandler::RunL() iObserver->EventL() call left <%d>",
+                       &iSession, leaveCode)
+                }
+            }
+        else
+            {
+            LOGIT1("Client [%d]: CConnMonEventHandler::RunL() failed in creating iConnMonEvent.", &iSession )
+            }
 
         // Initiate the next receive
         ReceiveNotification();
-
-        // If leave occurs in EventL, log and ignore
-        if ( leaveCode )
-            {
-            LOGIT2("Client [%d]: CConnMonEventHandler::RunL() iObserver->EventL() call left <%d>",
-                    &iSession, leaveCode)
-            }
         }
     else
         {
--- a/connectionmonitoring/connmon/connectionmonitor/src/ConnMonIAP.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/connectionmonitoring/connmon/connectionmonitor/src/ConnMonIAP.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -34,10 +34,38 @@
 #include "ConnMonBearerNotifier.h"
 #include "log.h"
 #include "cellulardatausagekeyupdater.h"
+#include "connmonasyncstopdaemon.h"
 
 // ============================ MEMBER FUNCTIONS ===============================
 
 // -----------------------------------------------------------------------------
+// TAsyncStopQueueElement::TAsyncStopQueueElement
+// -----------------------------------------------------------------------------
+//
+TAsyncStopQueueElement::TAsyncStopQueueElement( const RMessage2& aMessage )
+        :
+        iMessage( aMessage ),
+        iStatus( 0 ),
+        iIdCount( 0 ),
+        iStopCount( 0 )
+    {
+    }
+
+// -----------------------------------------------------------------------------
+// TAsyncStopQueueElement::Add
+// Add a connection ID to the ID array. Does nothing if the array is already full. 
+// -----------------------------------------------------------------------------
+//
+void TAsyncStopQueueElement::Add( TUint aConnectionId )
+    {
+    if ( iIdCount < KMaxConnectionCount )
+        {
+        iId[iIdCount] = aConnectionId;
+        iIdCount++;
+        }
+    }
+
+// -----------------------------------------------------------------------------
 // TConnInfo::TConnInfo
 // -----------------------------------------------------------------------------
 //
@@ -61,7 +89,8 @@
         iActivityNotifier( 0 ),
         iActivity( 0 ),
         iBearerInfo( aBearerInfo ),
-        iBearerNotifier( 0 )
+        iBearerNotifier( 0 ),
+        iAsyncStopStatus( EConnMonAsyncStopNotStarted )
     {
     }
 
@@ -88,6 +117,7 @@
     iActivityNotifier = 0;
     iActivity         = 0;
     iBearerNotifier   = 0;
+    iAsyncStopStatus  = EConnMonAsyncStopNotStarted;
     }
 
 // -----------------------------------------------------------------------------
@@ -341,6 +371,9 @@
 CConnMonIAP::~CConnMonIAP()
     {
     LOGENTRFN("CConnMonIAP::~CConnMonIAP()")
+            
+    iAsyncStopQueue.Close();
+    
     // Delele dial up modules.
     delete iCsdFax;
     iCsdFax = NULL;
@@ -1872,6 +1905,357 @@
     }
 
 // -----------------------------------------------------------------------------
+// CConnMonIAP::AsyncConnectionStopL
+// Checks parameter validity first. If all ok creates an active object that
+// completes the connection stop in a separate thread. 
+// -----------------------------------------------------------------------------
+//
+TInt CConnMonIAP::AsyncConnectionStopL( const RMessage2& aMessage )
+    {
+    LOGENTRFN("CConnMonIAP::AsyncConnectionStopL()")
+    TInt result( KErrGeneral );
+    TUint connectionId( aMessage.Int0() );
+    
+    TInt index = Index( connectionId );
+    if ( index < 0 )
+        {
+        LOGIT1("AsyncConnectionStopL: unknown connection index %d", connectionId)
+        result = KErrNotFound;
+        }
+    else
+        {
+        // Check if value is true or false
+        if ( !( aMessage.Int3() ) )
+            {
+            LOGIT("AsyncConnectionStopL: boolean value was false, quitting")
+            result = KErrNone;
+            }
+        else
+            {
+            if ( iConnInfos[index].iAsyncStopStatus != EConnMonStopCompleted )
+                {
+                TInt threadStartError( KErrNone );
+                if ( iConnInfos[index].iAsyncStopStatus == EConnMonAsyncStopNotStarted )
+                    {
+                    threadStartError = StartAsyncStopThreadL( index );
+                    }
+                if ( threadStartError == KErrNone )
+                    {
+                    // Associate this connection into this stop request
+                    TAsyncStopQueueElement request( aMessage );
+                    request.Add( connectionId );
+                    iAsyncStopQueue.Append( request );
+                    result = KRequestPending;
+                    }
+                else
+                    {
+                    result = threadStartError;
+                    }
+                }
+            else
+                {
+                // Connection has already been closed, but not yet removed from connection table
+                result = KErrNone;
+                }
+            }
+        }
+    LOGEXITFN1("CConnMonIAP::AsyncConnectionStopL()", result)
+    return result;
+    }
+
+// -----------------------------------------------------------------------------
+// CConnMonIAP::AsyncConnectionStopAllL
+// Checks parameter validity first. If all ok creates an active object for each
+// connection that completes the connection stop in a separate thread. If any
+// errors occur, returns the first encountered error code.
+// -----------------------------------------------------------------------------
+//
+TInt CConnMonIAP::AsyncConnectionStopAllL( const RMessage2& aMessage )
+    {
+    LOGENTRFN("CConnMonIAP::AsyncConnectionStopAllL()")
+
+    TInt result( KErrNone );
+    // Check if value is true or false
+    if ( !( aMessage.Int3() ) )
+        {
+        LOGIT("AsyncConnectionStopAllL: boolean value was false, quitting")
+        result = KErrNone;
+        }
+    else
+        {
+        TAsyncStopQueueElement request( aMessage );
+        TInt count = iConnInfos.Count();
+        result = KErrNone;
+        
+        for ( TInt i = 0; i < count; i++ )
+            {
+            if ( iConnInfos[i].iAsyncStopStatus != EConnMonStopCompleted )
+                {
+                TInt threadStartError( KErrNone );
+                if ( iConnInfos[i].iAsyncStopStatus == EConnMonAsyncStopNotStarted )
+                    {
+                    threadStartError = StartAsyncStopThreadL( i );
+                    }
+                if ( threadStartError == KErrNone )
+                    {
+                    // Associate this connection into this stop request
+                    request.Add( iConnInfos[i].iConnectionId );
+                    }
+                else
+                    {
+                    // Thread start failed
+                    if ( result == KErrNone )
+                        {
+                        // Keep only the first error that occurs
+                        result = threadStartError;
+                        }
+                    LOGIT2("AsyncConnectionStopAllL: Error starting stop thread for conn. id %d <%d>",
+                            iConnInfos[i].iConnectionId, threadStartError)
+                    }
+                }
+            }
+        // If one or more async connection stop threads have been started, and
+        // no errors have been encountered, set request to pending and add to
+        // queue to wait for thread(s) to complete.
+        if ( request.iIdCount > 0 )
+            {
+            if ( result == KErrNone )
+                {
+                iAsyncStopQueue.Append( request );
+                result = KRequestPending;
+                }
+            }
+        }
+    LOGEXITFN1("CConnMonIAP::AsyncConnectionStopAllL()", result)
+    return result;
+    }
+
+// -----------------------------------------------------------------------------
+// CConnMonIAP::StartAsyncStopThread
+// Starts a new thread to asynchronously stop a connection. Returns KErrNone if
+// thread started successfully.
+// -----------------------------------------------------------------------------
+//
+TInt CConnMonIAP::StartAsyncStopThreadL( TInt aIndex )
+    {
+    LOGENTRFN("CConnMonIAP::StartAsyncStopThreadL()")
+    TInt err( KErrNone );
+    
+    if ( aIndex < 0 || aIndex >= iConnInfos.Count() )
+        {
+        return KErrArgument;
+        }
+
+    iConnInfos[aIndex].iAsyncStopStatus = EConnMonAsyncStopStarted;
+    if ( iConnInfos[aIndex].iBearer < EBearerExternalCSD )
+        {
+        // Stop an internal connection
+        LOGIT("StartAsyncStopThreadL: connection type internal")
+
+        // Cancel data volume and activity notifiers before stopping
+        if ( iConnInfos[aIndex].iDLDataNotifier != 0 )
+            {
+            iConnInfos[aIndex].iDLDataNotifier->Cancel();
+            }
+        if ( iConnInfos[aIndex].iULDataNotifier != 0 )
+            {
+            iConnInfos[aIndex].iULDataNotifier->Cancel();
+            }
+        if ( iConnInfos[aIndex].iDataVolumeAO != 0 )
+            {
+            iConnInfos[aIndex].iDataVolumeAO->Cancel();
+            }
+        if ( iConnInfos[aIndex].iActivityNotifier != 0 )
+            {
+            iConnInfos[aIndex].iActivityNotifier->Cancel();
+            }
+
+        // Create and start a oneshot active object that starts and waits for
+        // the async stop thread to complete
+        CConnMonAsyncStopDaemon* asyncStopDaemon = CConnMonAsyncStopDaemon::NewL( this );
+        err = asyncStopDaemon->Start(
+                iConnInfos[aIndex].iConnectionId,
+                iConnInfos[aIndex].iIapId,
+                iConnInfos[aIndex].iNetId );
+        if ( err )
+            {
+            // Error, cleanup the active object since it did not start
+            delete asyncStopDaemon;
+            }
+        }
+    else if ( iConnInfos[aIndex].iBearer == EBearerExternalGPRS     ||
+              iConnInfos[aIndex].iBearer == EBearerExternalEdgeGPRS ||
+              iConnInfos[aIndex].iBearer == EBearerExternalWCDMA    ||
+              iConnInfos[aIndex].iBearer == EBearerExternalCDMA2000 ||
+              ( !iConnInfos[aIndex].iBearerInfo.iInternal &&
+                ( iConnInfos[aIndex].iBearerInfo.iBearer == EBearerInfoHSDPA ||
+                  iConnInfos[aIndex].iBearerInfo.iBearer == EBearerInfoHSUPA ||
+                  iConnInfos[aIndex].iBearerInfo.iBearer == EBearerInfoHSxPA ) ) )
+        {
+        // Stop an external PSD connection
+        LOGIT("StartAsyncStopThreadL: connection type external PSD")
+        if ( iPsdFax )
+            {
+            CConnMonAsyncStopDaemon* asyncStopDaemon = CConnMonAsyncStopDaemon::NewL( this );
+            err = asyncStopDaemon->Start(
+                    iConnInfos[aIndex].iConnectionId,
+                    iPsdFax );
+            if ( err )
+                {
+                // Error, cleanup the active object since it did not start
+                delete asyncStopDaemon;
+                }
+            }
+        else
+            {
+            err = KErrNotFound;
+            }
+        }
+    else if ( iConnInfos[aIndex].iBearer == EBearerExternalCSD   ||
+              iConnInfos[aIndex].iBearer == EBearerExternalHSCSD ||
+              iConnInfos[aIndex].iBearer == EBearerExternalWcdmaCSD )
+        {
+        LOGIT("AsyncConnectionStopL: Error, connection type external CSD not supported")
+        err = KErrNotSupported;
+        }
+    else
+        {
+        LOGIT("AsyncConnectionStopL: Error, unknown bearer")
+        err = KErrNotSupported;
+        }
+
+    LOGEXITFN1("CConnMonIAP::StartAsyncStopThreadL()", err)
+    return err;
+    }
+
+// -----------------------------------------------------------------------------
+// CConnMonIAP::CompleteAsyncStopReqs
+// Called when an asynchronous connection stop has completed.
+// This method will go through all pending async connection stop requests and
+// mark this connections status to those requests that are waiting for it.
+// Those requests that were only waiting for this connection anymore, are
+// completed.
+// -----------------------------------------------------------------------------
+//
+void CConnMonIAP::CompleteAsyncStopReqs( const TUint aConnectionId, const TInt aError )
+    {
+    LOGENTRFN("CConnMonIAP::CompleteAsyncStopReqs()")
+
+    // Mark the internal status of the connection to stopped
+    TInt index = Index( aConnectionId );
+    LOGIT3("Connection %d (index %d) marked as stopped <%d>", aConnectionId, index, aError)
+    if ( index >= 0 )
+        {
+        iConnInfos[index].iAsyncStopStatus = EConnMonStopCompleted;
+        }
+
+#ifdef _DEBUG    
+    LOGIT1("iAsyncStopQueue contents (%d:)", iAsyncStopQueue.Count() )
+    for ( TInt i = 0; i < iAsyncStopQueue.Count(); i++ )
+        {
+        LOGIT1("iIdCount   = %d", iAsyncStopQueue[i].iIdCount)
+        LOGIT1("iStopCount = %d", iAsyncStopQueue[i].iStopCount)
+        LOGIT1("iStatus    = %d", iAsyncStopQueue[i].iStatus)
+        for ( TInt j = 0; j < iAsyncStopQueue[i].iIdCount; j++ )
+            {
+            LOGIT1(".       id = %02d", iAsyncStopQueue[i].iId[j])
+            }
+        }
+#endif // _DEBUG
+
+    // Go through all pending async stop requests. If a request has been
+    // cancelled, it has been removed from this array already.
+    for ( TInt i = 0; i < iAsyncStopQueue.Count(); i++ )
+        {
+        // Go through all connections related to this request
+        for ( TInt j = 0; j < iAsyncStopQueue[i].iIdCount; j++ )
+            {
+            // Was this request waiting for the connection that was just stopped
+            if ( iAsyncStopQueue[i].iId[j] == aConnectionId )
+                {
+                iAsyncStopQueue[i].iStopCount++;
+                // Set iAsyncStopQueue[i].iId[j] to 0 if tracking is needed
+
+                // Store the first encountered error
+                if ( aError && iAsyncStopQueue[i].iStatus == KErrNone )
+                    {
+                    iAsyncStopQueue[i].iStatus = aError;
+                    }
+                }
+            }
+        // Have all connections stopped that this request is waiting for
+        if ( iAsyncStopQueue[i].iStopCount >= iAsyncStopQueue[i].iIdCount )
+            {
+            LOGIT3("Completing request at index %d, id count %d <%d>",
+                    i, iAsyncStopQueue[i].iIdCount, iAsyncStopQueue[i].iStatus)
+            iAsyncStopQueue[i].iMessage.Complete( iAsyncStopQueue[i].iStatus );
+            iAsyncStopQueue.Remove( i );
+            i--;
+            }
+        }
+    LOGEXITFN("CConnMonIAP::CompleteAsyncStopReqs()")
+    }
+
+// -----------------------------------------------------------------------------
+// CConnMonIAP::CleanupConnectionInfo
+// If the stopped connection is still in the connection info array and
+// connection up/down notifier isn't running, removes the obsolete information
+// and notifiers from the connection info array.
+// -----------------------------------------------------------------------------
+//
+TInt CConnMonIAP::CleanupConnectionInfo( const TUint& aConnectionId )
+    {
+    LOGENTRFN("CConnMonIAP::CleanupConnectionInfo()")
+    TInt err( KErrNone );
+    
+    TInt index = Index( aConnectionId );
+    if ( index < 0 )
+        {
+        LOGIT("CleanupConnectionInfo: ID no longer in connection table")
+        err = KErrNotFound;
+        }
+    else
+        {
+        // If conn up/down notifier is active, let the event remove connection later.
+        if ( !iConnUpDownNotifier || !iConnUpDownNotifier->IsActive() )
+            {
+            err = RemoveConnection( iConnInfos[index] );
+            }
+        else
+            {
+            LOGIT("CleanupConnectionInfo: iConnUpDownNotifier active, letting event do cleanup")
+            err = KErrNone;
+            }
+        }
+    LOGEXITFN1("CConnMonIAP::CleanupConnectionInfo()", err)
+    return err;
+    }
+
+// -----------------------------------------------------------------------------
+// CConnMonIAP::CancelAsyncStopReqs
+// Cancels all asynchronous connection stop request for a specific client.
+// -----------------------------------------------------------------------------
+//
+void CConnMonIAP::CancelAsyncStopReqs( CSession2* aSession )
+    {
+    LOGENTRFN("CConnMonIAP::CancelAsyncStopReqs()")
+
+    LOGIT1("AsyncStopQueue count = %d", iAsyncStopQueue.Count())
+    for ( TInt i = 0; i < iAsyncStopQueue.Count(); i++ )
+        {
+        if ( iAsyncStopQueue[i].iMessage.Session() == aSession )
+            {
+            iAsyncStopQueue[i].iMessage.Complete( KErrCancel );
+            iAsyncStopQueue.Remove( i );
+            i--;
+            LOGIT1("Cancelled a request for session %d", aSession)
+            }
+        }
+
+    LOGEXITFN("CConnMonIAP::CancelAsyncStopReqs()")
+    }
+
+// -----------------------------------------------------------------------------
 // CConnMonIAP::SetBoolAttributeL
 // Used for stopping the connections.
 // -----------------------------------------------------------------------------
--- a/connectionmonitoring/connmon/connectionmonitor/src/ConnMonServ.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/connectionmonitoring/connmon/connectionmonitor/src/ConnMonServ.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -909,6 +909,7 @@
     switch ( aMsg.Function() )
         {
         case EReqSetBoolAttribute:
+        case EReqSetAsyncBoolAttribute:
             {
             switch ( aMsg.Int2() )
                 {
--- a/connectionmonitoring/connmon/connectionmonitor/src/ConnMonSess.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/connectionmonitoring/connmon/connectionmonitor/src/ConnMonSess.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -271,6 +271,11 @@
             rc = SetBoolAttribute();
             CompleteMessage( rc );
             break;
+            
+        case EReqSetAsyncBoolAttribute:
+            rc = SetAsyncBoolAttributeL();
+            CompleteMessage( rc );
+            break;
 
         case EReqSetStringAttribute:
             rc = SetStringAttributeL();
@@ -1407,6 +1412,37 @@
     return err;
     }
 
+// -----------------------------------------------------------------------------
+// CConnMonSession::SetAsyncBoolAttributeL
+// -----------------------------------------------------------------------------
+//
+TInt CConnMonSession::SetAsyncBoolAttributeL()
+    {
+    LOGENTRFN("CConnMonSession::SetAsyncBoolAttributeL()")
+    TInt err( KErrNotSupported );
+    TUint attribute( Message().Int2() );
+    LOGIT3("SERVER: EReqSetAsyncBoolAttribute IN: id %d, attr %d, value %d",
+            Message().Int0(), attribute, Message().Int3())
+
+    if ( attribute == KConnectionStop )
+        {
+        // Will check connection id validity first, then bool attribute value.
+        err = iCmServer->Iap()->AsyncConnectionStopL( Message() );
+        }
+    else if ( attribute == KConnectionStopAll )
+        {
+        // Connection id is ignored. Will check bool attribute value.
+        err = iCmServer->Iap()->AsyncConnectionStopAllL( Message() );
+        }
+    else
+        {
+        // No plugin support
+        err = KErrNotSupported;
+        }
+
+    LOGEXITFN1("CConnMonSession::SetAsyncBoolAttributeL()", err)
+    return err;
+    }
 
 // -----------------------------------------------------------------------------
 // CConnMonSession::SetStringAttribute
@@ -1518,6 +1554,11 @@
             CompleteActivityRequests( iConnParams[i].iConnectionId, EFalse, KErrCancel );
             }
         }
+    else if ( EConnMonSetBoolAttribute == requestToCancel )
+        {
+        // Complete all pending asynchronous connection stop requests with status 'KErrCancel'
+        iCmServer->Iap()->CancelAsyncStopReqs( Message().Session() );
+        }
 
     // Complete all pending plugin requests (of type Message().Int0()) with 'KErrCancel'
     RThread clientThread;
--- a/connectionmonitoring/connmon/connectionmonitor/src/RConnMon.cpp	Wed Oct 27 17:43:56 2010 +0300
+++ b/connectionmonitoring/connmon/connectionmonitor/src/RConnMon.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -360,6 +360,25 @@
     }
 
 // -----------------------------------------------------------------------------
+// RConnectionMonitor::SetBoolAttribute
+// -----------------------------------------------------------------------------
+//
+EXPORT_C void RConnectionMonitor::SetBoolAttribute(
+        const TUint aConnectionId,
+        const TUint aSubConnectionId,
+        const TUint aAttribute,
+        const TBool aValue,
+        TRequestStatus& aStatus ) const
+    {
+    LOGIT5("Client [%d]: SetBoolAttribute() ASYNC, conn.id %d, sub.conn.id %d, attribute %d, value %d",
+            this, aConnectionId, aSubConnectionId, aAttribute, aValue)
+
+    TIpcArgs args( aConnectionId, aSubConnectionId, aAttribute, aValue );
+
+    SendReceive( EReqSetAsyncBoolAttribute, args, aStatus );
+    }
+
+// -----------------------------------------------------------------------------
 // RConnectionMonitor::SetStringAttribute
 // -----------------------------------------------------------------------------
 //
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/connectionmonitoring/connmon/connectionmonitor/src/connmonasyncstopdaemon.cpp	Wed Oct 27 17:51:11 2010 +0300
@@ -0,0 +1,221 @@
+/*
+* Copyright (c) 2010 Nokia Corporation and/or its subsidiary(-ies).
+* All rights reserved.
+* This component and the accompanying materials are made available
+* under the terms of "Eclipse Public License v1.0"
+* which accompanies this distribution, and is available
+* at the URL "http://www.eclipse.org/legal/epl-v10.html".
+*
+* Initial Contributors:
+* Nokia Corporation - initial contribution.
+*
+* Contributors:
+*
+* Description:  Active object that starts a connection stop operation
+*               in a new thread and waits for it to complete.
+*/
+
+#include "ConnMonIAP.h"
+#include "CPsdFax.h"
+#include "connmonasyncstopdaemon.h"
+#include "log.h"
+
+TAsyncStopThreadData::TAsyncStopThreadData(
+        TUint32 aIapId,
+        TUint32 aNetId )
+        :
+        iIapId( aIapId ),
+        iNetId( aNetId )
+    {
+    iStep = 0;
+    iErrorCode = 0;
+    }
+
+
+TInt ConnectionStopThreadFunction( TAny* aPtr )
+    {
+    TInt err( KErrNone );
+    TAsyncStopThreadData* threadData = (TAsyncStopThreadData*)aPtr;
+
+    RSocketServ socketServer;
+    RConnection connection;
+    TConnectionInfo info;
+
+    err = socketServer.Connect( KCmESockMessageSlots );
+    threadData->iErrorCode = err;
+    if ( !err )
+        {
+        err = connection.Open( socketServer, KAfInet );
+        threadData->iStep++; // Step 1
+        threadData->iErrorCode = err;
+        if ( !err )
+            {
+            info.iIapId = threadData->iIapId;
+            info.iNetId = threadData->iNetId;
+            err = connection.Attach(
+                    TPckg<TConnectionInfo>( info ),
+                    RConnection::EAttachTypeNormal );
+            threadData->iStep++; // Step 2
+            threadData->iErrorCode = err;
+            if ( !err )
+                {
+                err = connection.Stop( RConnection::EStopAuthoritative );
+                threadData->iStep++; // Step 3
+                threadData->iErrorCode = err;
+                }
+            connection.Close();
+            }
+        socketServer.Close();
+        }
+
+    return err;
+    }
+
+CConnMonAsyncStopDaemon* CConnMonAsyncStopDaemon::NewL( CConnMonIAP* aIap )
+    {
+    CConnMonAsyncStopDaemon* self = CConnMonAsyncStopDaemon::NewLC( aIap );
+    CleanupStack::Pop( self );
+    return self;
+    }
+
+CConnMonAsyncStopDaemon* CConnMonAsyncStopDaemon::NewLC( CConnMonIAP* aIap )
+    {
+    CConnMonAsyncStopDaemon* self = new( ELeave ) CConnMonAsyncStopDaemon( aIap );
+    CleanupStack::PushL( self );
+    self->Construct();
+    return self;
+    }
+
+CConnMonAsyncStopDaemon::~CConnMonAsyncStopDaemon()
+    {
+    LOGENTRFN("~CConnMonAsyncStopDaemon()")
+    // Must not be active at this point. Can't be cancelled.
+
+    delete iData;
+    iData = NULL;
+
+    LOGEXITFN("~CConnMonAsyncStopDaemon()")
+    }
+
+CConnMonAsyncStopDaemon::CConnMonAsyncStopDaemon( CConnMonIAP* aIap )
+        :
+        CActive( EConnMonPriorityHigh ),
+        iIap( aIap ),
+        iPsdFax( NULL ),
+        iData( NULL ),
+        iConnectionType( EConnMonStopTypeUnknown ),
+        iConnectionId( 0 )
+    {
+    }
+
+void CConnMonAsyncStopDaemon::Construct()
+    {
+    //LOGENTRFN("CConnMonAsyncStopDaemon::Construct()")
+    CActiveScheduler::Add( this );
+    //LOGEXITFN("CConnMonAsyncStopDaemon::Construct()")
+    }
+
+TInt CConnMonAsyncStopDaemon::Start( TUint aConnectionId, TUint32 aIapId, TUint32 aNetId )
+    {
+    LOGENTRFN("CConnMonAsyncStopDaemon::Start()")
+    TInt err( KErrNone );
+    iConnectionType = EConnMonStopTypeInternal;
+    iConnectionId = aConnectionId;
+
+    LOGIT3("Starting async stop daemon, id %d, iap id %d, net id %d", aConnectionId, aIapId, aNetId)
+    iData = new TAsyncStopThreadData( aIapId, aNetId );
+    if ( !iData )
+        {
+        err = KErrNoMemory;
+        LOGEXITFN1("CConnMonAsyncStopDaemon::Start()", err)
+        return err;
+        }
+
+    _LIT( KTempName, "connmonstop%d" );
+    TBuf<KConnMonSmallBufferLen> name;
+    name.Format( KTempName(), iConnectionId );
+
+    RThread thread;
+    err = thread.Create(
+            name,
+            ConnectionStopThreadFunction,
+            KCmStopThreadStackSize,
+            NULL,
+            reinterpret_cast<TAny*>( iData ) );
+    LOGIT1("CConnMonAsyncStopDaemon::Start(): Thread created <%d>", err)
+
+    if ( !err )
+        {
+        thread.Logon( iStatus );
+        SetActive();
+        thread.Resume();
+        }
+
+    LOGEXITFN1("CConnMonAsyncStopDaemon::Start()", err)
+    return err;
+    }
+
+TInt CConnMonAsyncStopDaemon::Start( const TUint aConnectionId, CPsdFax* aPsdFax )
+    {
+    LOGENTRFN("CConnMonAsyncStopDaemon::Start()")
+    TInt err( KErrNone );
+    iConnectionType = EConnMonStopTypeExternalPsd;
+    iConnectionId = aConnectionId;
+    iPsdFax = aPsdFax;
+
+    err = iPsdFax->Stop( aConnectionId, iStatus );
+    if ( !err )
+        {
+        SetActive();
+        }
+
+    LOGEXITFN1("CConnMonAsyncStopDaemon::Start()", err)
+    return err;
+    }
+
+void CConnMonAsyncStopDaemon::DoCancel()
+    {
+    LOGENTRFN("CConnMonAsyncStopDaemon::DoCancel()")
+    
+    // The cancel process is synchronous from OS side, and can't be cancelled.
+    // There could also be multiple clients waiting for the same connection stop process.
+    
+    LOGEXITFN("CConnMonAsyncStopDaemon::DoCancel()")
+    }
+
+// -----------------------------------------------------------------------------
+// CConnMonAsyncStopDaemon::RunL
+// When the separate thread closes the connection and finishes executing,
+// logon-operation completes and this RunL is executed by active scheduler.
+// Since this is a oneshot active object, the RunL will delete itself at the end.
+// -----------------------------------------------------------------------------
+//
+void CConnMonAsyncStopDaemon::RunL()
+    {
+    LOGIT(".")
+    LOGIT2("RunL: CConnMonAsyncStopDaemon, status %d, stop type %d", iStatus.Int(), iConnectionType)
+
+    if ( iData )
+        {
+        LOGIT2("Thread steps done %d/3, err <%d>", iData->iStep, iData->iErrorCode)
+        }
+
+    iIap->CompleteAsyncStopReqs( iConnectionId, iStatus.Int() );
+
+    switch ( iConnectionType )
+        {
+        case EConnMonStopTypeInternal:
+            iIap->CleanupConnectionInfo( iConnectionId );
+            break;
+        case EConnMonStopTypeExternalPsd:
+            iPsdFax->CleanupConnectionInfo( iConnectionId );
+            break;
+        default:
+            // error
+            break;
+        }
+
+    delete this;
+    }
+
+// End of file
--- a/group/bld.inf	Wed Oct 27 17:43:56 2010 +0300
+++ b/group/bld.inf	Wed Oct 27 17:51:11 2010 +0300
@@ -27,7 +27,6 @@
 
 PRJ_MMPFILES
 #include "../alwayson_net_plugin/group/bld.inf"
-#include "../apengine/group/bld.inf"
 #include "../bearermanagement/group/bld.inf"
 #include "../cmmanager/group/bld.inf"
 #include "../connectionmonitoring/group/bld.inf"
--- a/ipcm_plat/access_point_engine_misc_api/access_point_engine_misc_api.metaxml	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<api id="7b5f383134e4f9cbc68be65994b580cb" dataversion="1.0">
-  <name>Access Point Engine Misc API</name>
-  <description>Some complementary features can be used by this API, such as management of protected access points, VPN Access Points.</description>
-  <type>c++</type>
-  <subsystem>networkingutilities</subsystem>
-  <libs>
-    <lib name="apengine.lib" />
-  </libs>
-  <release category="domain" deprecatedsince="3.2"/>
-  <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
-     <htmldocprovided>yes</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/ipcm_plat/access_point_engine_misc_api/group/bld.inf	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,29 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  File that exports the files belonging to 
-:                Access Point Engine Misc API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/VpnAPEngine.h     MW_LAYER_PLATFORM_EXPORT_PATH(VpnApEngine.h)
-../inc/VpnAPItem.h     MW_LAYER_PLATFORM_EXPORT_PATH(VpnApItem.h)
-../inc/ApProtHandler.h     MW_LAYER_PLATFORM_EXPORT_PATH(ApProtHandler.h)
--- a/ipcm_plat/access_point_engine_misc_api/inc/ApProtHandler.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,239 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the CApProtHandler class.
-*
-*/
-
-
-#ifndef CAPPROTHANDLER_H
-#define CAPPROTHANDLER_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
- 
-//  INCLUDES
-#include <e32base.h>
-#include <ApEngineVer.h>
-
-
-
-
-// FORWARD DECLARATION
-class CCommsDatabase;
-class CCommsDbTableView;
-
-// CLASS DECLARATION
-/**
-*  A collection of access point protection handling routines.
-*/
-NONSHARABLE_CLASS( CApProtHandler )
-    {
-    public:  // New functions
-
-        /**
-        * Returns whether the Access Point Table is protected or not.
-        * If the table is protected, new access points can not be added,
-        * existing ones can not be modified and can not be deleted.
-        * @param aDb The database object
-        * @return TBool indicating whether the table is protected or not.
-        *
-        * @deprecated
-        */
-        IMPORT_C static TBool IsTableProtectedL( CCommsDatabase* aDb );
-
-
-        /**
-        * Returns whether the given Access Point is protected or not.
-        * If the access point is protected, it can not be modified and
-        * can not be deleted.
-        * @param aDb    The database object
-        * @param aUid   The uid of the access point
-        * @return TBool indicating whether the access point is protected or not
-        *
-        * @deprecated
-        */
-        IMPORT_C static TBool IsApProtectedL( CCommsDatabase* aDb,
-                                             TUint32 aUid );
-
-
-        /**
-        * Sets a given Access Point to protected.
-        * If the access point is protected, it can not be modified and
-        * can not be deleted.
-        * @param aDb    The database object
-        * @param aUid   The uid of the access point
-        *
-        * @deprecated
-        */
-        IMPORT_C static void ProtectItemL( CCommsDatabase* aDb, TUint32 aUid );
-
-
-        /**
-        * Sets a given Access Point to not-protected.
-        * If the access point is not protected, it can be modified and
-        * can be deleted.
-        * @param aDb    The database object
-        * @param aUid   The uid of the access point
-        *
-        * @deprecated
-        */
-        IMPORT_C static void UnprotectItemL( CCommsDatabase* aDb, 
-                                             TUint32 aUid );
-
-        /**
-        * Sets the access point table to protected.
-        * If the table is protected, new access points can not be added,
-        * existing ones can not be modified and can not be deleted.
-        * @param aDb    The database object
-        *
-        * @deprecated
-        */
-        IMPORT_C static void ProtectTableL( CCommsDatabase* aDb );
-
-
-        /**
-        * Sets the access point table to not-protected.
-        * If the table is not protected, new access points can be added,
-        * existing ones can be modified and can be deleted.
-        * @param aDb    The database object
-        *
-        * @deprecated
-        */
-        IMPORT_C static void UnprotectTableL( CCommsDatabase* aDb );
-
-
-        /**
-        * Gets whether the preferences are protected or not
-        * @param aDb    The database object
-        * @returns TBool indicating whether the preferences are protected
-        * or not
-        *
-        * @deprecated
-        */
-        IMPORT_C static TBool IsPreferencesProtectedL( CCommsDatabase* aDb );
-
-
-        /**
-        * Sets the preferences to protected.
-        * @param aDb    The database object
-        *
-        * @deprecated
-        */
-        IMPORT_C static void ProtectPreferencesL( CCommsDatabase* aDb );
-
-
-        /**
-        * Sets the preferences to not-protected.
-        * @param aDb    The database object
-        *
-        * @deprecated
-        */
-        IMPORT_C static void UnprotectPreferencesL( CCommsDatabase* aDb );
-
-
-        // The following are not exported, for internal use only!
-        /**
-        * Returns whether the given record in the given table
-        * is protected or not.
-        * If the record is protected, it can not be modified and
-        * can not be deleted.
-        * @param aDb The database object in use
-        * @param the table to use
-        * @param the uid of the record
-        * @return whether the given record in the given table
-        * is protected or not.
-        */
-        static TBool IsRecordProtectedL( CCommsDatabase* aDb,
-                                    const TDesC& aTable, TUint32 aUid );
-
-        /**
-        * Protects a given record in a given table.
-        * @param aDb The database object in use
-        * @param the table to use
-        * @param the uid of the record
-        */
-        static void ProtectRecordL( CCommsDatabase* aDb,
-                                 const TDesC& aTable, TUint32 aUid );
-
-
-        /**
-        * Unprotects a given record in a given table.
-        * @param aDb The database object in use
-        * @param the table to use
-        * @param the uid of the record
-        */
-        static void UnprotectRecordL( CCommsDatabase* aDb,
-                                    const TDesC& aTable, TUint32 aUid );
-
-
-        /**
-        * Returns whether the given table in a given database is
-        * protected or not.
-        * @param aDb The database object in use
-        * @param the table we need the info on
-        * @returns TBool indicating whether the given table in a given
-        * database is protected or not.
-        */
-        static TBool IsTableProtectedL( CCommsDatabase* aDb,
-                                        const TDesC& aTable );
-
-
-        /**
-        * Protects a given table in a given database.
-        * @param aDb    The database object in use
-        * @param aTable The table to protect
-        */
-        static void ProtectTableL( CCommsDatabase* aDb, const TDesC& aTable );
-
-        /**
-        * Unprotects a given table in a given database.
-        * @param aDb The database object in use
-        * @param aTable The table to unprotect
-        */
-        static void UnprotectTableL( CCommsDatabase* aDb,
-                                     const TDesC& aTable );
-
-        /**
-        * Gets the current records' protection state
-        * aTable MUST be open and record cursor set to desired record
-        * @param aTable The table containign the record whose protection 
-        * sate we would like to get
-        * @return The records' protection state
-        */
-        static TBool GetProtectionStateL( CCommsDbTableView& aTable );
-
-
-
-        /**
-        * Remove all protected AP-s and sets the table to be 'updatable'.
-        * @param aDb The database object in use
-        *
-        * @deprecated
-        */
-        IMPORT_C static void RemoveProtectedAccessPointsL(CCommsDatabase* aDb);
-
-
-        /**
-        * Remove all protected AP-s and sets the table to be 'updatable'.
-        * @param aDb The database object in use
-        */
-        static void DoRemoveProtectedAccessPointsL( CCommsDatabase& aDb );
-    
-
-    };
-
-#endif
-
-// End of File
--- a/ipcm_plat/access_point_engine_misc_api/inc/VpnAPEngine.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,360 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declares the main handler, CVpnAPEngine and the public API for 
-*     the Vpn Access Point Engine.
-*
-*/
-
-
-#ifndef VPN_AP_ENGINE_H
-#define VPN_AP_ENGINE_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
- 
-// INCLUDES
-#include    <e32base.h>
-
-// CONSTANTS
-
-
-// FORWARD DECLARATIONS
-class CCommsDatabase;
-class CVpnApItem;
-
-// CLASS DECLARATION
-/**
-* CVpnApEngine class: It is the main handler for the VPN Access Point Engine.
-* It contains the only public API for other (sub)systems.
-*
-*/
-NONSHARABLE_CLASS( CVpnApEngine ) : public CBase
-    {
-
-    public: // Constructors and destructor
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the VPN access point engine
-        * object. This object is a thin layer above the VpnApEngine which 
-        * uses Access Point Engine (ApEngine) and it provides a 
-        * simple interface to the VPN ApEngine enabling creation, deletion 
-        * and editing of VPN access points.
-        * @param aDb a pointer to a CCommsDataBase object, might be NULL
-        * @return The constructed CVpnApEngine object.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CVpnApEngine* NewLC( CCommsDatabase* aDb = NULL );
-
-
-
-        /**
-        * Destructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C ~CVpnApEngine( );
-
-
-
-    protected:
-        /**
-        * Second-phase constructor.
-        * @param aDb The database
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL( CCommsDatabase* aDb );
-
-
-    private:
-        /**
-        * Constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C CVpnApEngine( );
-
-
-    public: // New functions
-
-        /**
-        * Creates a new VPN from the passed CVpnApItem
-        * @param aVpnApItem a CVpnApItem holding the data
-        * @return The WAP ID of the succesfully created VPN AP.
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 CreateVpnApL( CVpnApItem& aVpnApItem );
-
-
-        /**
-        * Creates a new VPN from the passed VPN data
-        * @param aName The name of the access point.
-        * @param aIapId A TUint32 holding the real internet access point ID
-        * @param aPolicy a TDesC& Holding the policy for the VPN
-        * @param aProxyServerAddress a TDesC* holding the proxy server address
-        * @param aProxyPort A TUint32 specifying the proxy's port number
-        * @return The created VPN access point's WAP ID
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 CreateVpnApL( TDesC& aName, 
-                                       TUint32 aIapId, 
-                                       TDesC& aPolicy, 
-                                       TDesC* aProxyServerAddress = NULL, 
-                                       TUint32 aProxyPort = 0 );
-
-
-        /**
-        * Deletes the VPN access poitn indentified by it's WAP ID
-        * @param aVpnApId A TUint32 The WAP ID of the vpn access point to be 
-        *   deleted
-        * Might Leave on error.
-        *
-        * @deprecated
-        */
-        IMPORT_C void DeleteVpnL( TUint32 aVpnApId );
-
-
-
-        /**
-        * Reads up one VPN access point's data from the database.
-        * Expects that CVpnApEngine has been created and the database had
-        * been opened.
-        * In case of error, function leaves with error code.
-        * <br>Error conditions:
-        *   - Insufficient memory,
-        *   - AP does not exists,
-        *   - Server connection failure.
-        *
-        * @param aUid The WAP Uid of the VPN access point to be read
-        * @param aApItem A reference to a CApAccessPointItem to hold the data.
-        * @return no return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void VpnDataL( TUint32 aUid, CVpnApItem& aVpnApItem );
-
-
-
-        // update
-        /**
-        * Updates data stored in an existing VPN access point.
-        * Expects that CVpnApEngine has been created and the database had
-        * been opened.
-        * In case of error, no data is stored.
-        * <br>Error conditions:
-        *   - Insufficient memory
-        *   - Server connection failure
-        *   - Lock already present by other task
-        *   - Uid does not exists.
-        *   - Attempting to update read-only records will result
-        *     in KErrAccessDenied
-        *
-        * @param aApItem A reference to a CApAccessPointItem holding the data
-        * @return No return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void UpdateVpnDataL( CVpnApItem& aVpnApItem );
-
-
-        /**
-        * Gives whether the access point identified by the passed WAP ID
-        * is a VPN access point or not.
-        * @param aUid The UID of the access point
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool IsVpnApL( const TUint32 aUid );
-
-
-        /**
-        * Component Validation Test.
-        * @return KErrNone.
-        *
-        * @deprecated
-        */
-        IMPORT_C static TInt Cvt();
-
-
-    protected:  // New functions
-        /**
-        * Creates a new VPN from the passed VPN item
-        * @param aIsNew Booleasn stating whether it is a new AP or not
-        * @param aVpnApItem A CVpnApItem holding the VPN access point data
-        * @return The created VPN access point's WAP ID
-        */
-        TUint32 DoCreateVpnApL( TBool aIsNew, CVpnApItem& aVpnApItem );
-        
-        
-        /**
-        * Writes the VPN data part from the passed VPN item
-        * @param aIsNew Booleasn stating whether it is a new AP or not
-        * @param aVpnApItem A CVpnApItem holding the VPN access point data
-        */
-        void WriteVpnDataL( TBool aIsNew, CVpnApItem& aVpnApItem );
-
-
-        /**
-        * Creates a virtual bearer record if needed
-        * @return The virtual bearer record ID
-        */
-        TUint32 CreateVirtBearerIfNeededL();
-
-
-        /**
-        * Writes the VPN-IAP data part from the passed VPN item
-        * @param aIsNew Booleasn stating whether it is a new AP or not
-        * @param aVpnApItem A CVpnApItem holding the VPN access point data
-        * @return The IAP ID for the VPN part
-        */
-        TUint32 WriteVpnIapRecordL( TBool aIsNew, CVpnApItem& aVpnApItem );
-
-
-        /**
-        * Gets the location record ID
-        * @return The ID of the location record 
-        */
-        TUint32 GetLocationIdL();
-
-
-        /**
-        * Writes the VPN-WAP data part from the passed VPN item
-        * @param aIsNew Booleasn stating whether it is a new AP or not
-        * @param aVpnApItem A CVpnApItem holding the VPN access point data
-        */
-        void    WriteVpnWapApDataL( TBool aIsNew, CVpnApItem& aVpnApItem );
-
-
-        /**
-        * Writes the VPN-WAP bearer data part from the passed VPN item
-        * @param aIsNew Booleasn stating whether it is a new AP or not
-        * @param aVpnApItem A CVpnApItem holding the VPN access point data
-        */
-        void    WriteVpnWapBearerDataL( TBool aIsNew, CVpnApItem& aVpnApItem );
-
-
-        /**
-        * Reads up the VPN-WAP bearer data part into the passed VPN item
-        * @param aUid The WAP-bearer part's record ID
-        * @param aVpnApItem A CVpnApItem to hold the readed data
-        */
-        void    ReadVpnWapBearerDataL( TUint32 aUid, CVpnApItem& aVpnApItem );
-
-
-        /**
-        * Reads up the VPN-WAP data part into the passed VPN item
-        * The WAP record ID should already been set by an earlier call to
-        * ReadVpnWapBearerDataL
-        * @param aVpnApItem A CVpnApItem to hold the readed data
-        */
-        void    ReadVpnWapApDataL( CVpnApItem& aVpnApItem );
-
-
-        /**
-        * Reads up the VPN-IAP data part into the passed VPN item
-        * The IAP record ID should already been set by an earlier call to
-        * ReadVpnWapApDataL
-        * @param aVpnApItem A CVpnApItem to hold the readed data
-        */
-        void    ReadVpnIapRecordL( CVpnApItem& aVpnApItem );
-
-
-        /**
-        * Reads up the VPN data part into the passed VPN item
-        * The VPN record ID should already been set by an earlier call to
-        * ReadVpnIapRecordL
-        * @param aVpnApItem A CVpnApItem to hold the readed data
-        */
-        void    ReadVpnDataL( CVpnApItem& aVpnApItem );
-
-
-        /**
-        * Writes the proxy data of the passed VPN access point item 
-        * @param aIsNew Boolean stating whether the access point is new
-        * @param aVpnApItem A CVpnApItem holding the current VPN data
-        */
-        void    WriteProxyDataL( TBool aIsNew, const CVpnApItem& aVpnApItem );
-
-
-        /**
-        * Reads the proxy data into the passed VPN access point item 
-        * @param aVpnApItem A CVpnApItem holding the current VPN data
-        */
-        void    ReadProxyDataL( CVpnApItem& aVpnApItem );
-
-
-        /**
-        * Deletes the VPN proxy data
-        * @param aIspId The Isp record ID for which the proxy data should be
-        * deleted 
-        */
-        void    RemoveVpnProxyDataL( TUint32 aIspId );
-
-
-        /**
-        * Deletes the VPN data
-        * @param aUid The UID of the VPN access point to be deleted.
-        */
-        void    DoDeleteVpnL( TUint32 aUid );
-
-
-
-        /**
-        * Removes a record from a table
-        * @param aTable The table to remove from
-        * @param aUid   The record ID to remove
-        */
-        void    RemoveRecordL( const TDesC& aTable, TUint32 aUid );
-
-
-        /**
-        * Writes the network data of the passed VPN access point item 
-        * @param aIsNew Boolean stating whether the access point is new
-        * @param aVpnApItem A CVpnApItem holding the current network data
-        */
-        void    WriteNetworkDataL( TBool aIsNew, CVpnApItem& aVpnApItem );
-
-
-        /**
-        * Reads up the network data into the passed VPN access point item
-        * @param aVpnApItem A CVpnApItem holding the current VPN data
-        */
-        void    ReadNetworkDataL( CVpnApItem& aVpnApItem );
-
-
-        /**
-        * Removes a network data
-        * @param aIspId The Network record ID which should be deleted
-        */
-        void    RemoveNetworkDataL( TUint32 aIspId );
-
-
-    protected:  // Functions from base classes
-
-
-    private: //data 
-        TBool               iOwnDb;
-        CCommsDatabase*     iDb;
-    };
-
-#endif 
-
-// End of File
--- a/ipcm_plat/access_point_engine_misc_api/inc/VpnAPItem.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,352 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declares the main handler, CVpnAPItem and the API for 
-*     the Vpn Access Point Engine.
-*
-*/
-
-
-#ifndef VPN_AP_ITEM_H
-#define VPN_AP_ITEM_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
- 
-// INCLUDES
-#include    <e32base.h>
-
-// CONSTANTS
-enum TVpnApMember
-    {
-    // WAP Access Point Table
-    EApVpnWapAccessPointID,         ///< The Uid of the VPN access point.
-                                    ///< READ ONLY, assigned by the database.
-                                    ///< TUint32
-    EApVpnWapAccessPointName,       ///< The name of the access point, TDesC16
-
-    EApVpnRealWapID,                ///< WAP ID of the real IAP ap, TUint32
-    EApVpnIapID,                    ///< IAP ID of the VPN IAP record, TUint32
-    EApVpnRealIapID,                ///< IAP ID of the real IAP record used
-                                    ///< to create connection, TUint32
-    EApVpnRealIapName,              ///< IAP name of the real IAP record used
-                                    ///< to create connection, Text
-    EApVpnPolicy,                   ///< The VPN policy to be used, TDesC16
-    EApVpnPolicyId,                 ///< The VPN policy to be used, TDesC16
-    EApVpnProxyServerAddress,       ///< Proxy server address, long text
-    EApVpnProxyPortNumber,          ///< Proxy port number,  TUint32
-
-    EApVpnHomeNetworkID,            ///< The ID of the home netwokr, TUint32
-    EApVpnIapNetworkID,             ///< The ID of the home netwokr, TUint32
-    EApVpnIapNetworkName,           ///< The name of the home netwokr, TDesC16
-    };
-
-
-
-
-
-// FORWARD DECLARATIONS
-class CCommsDatabase;
-
-// CLASS DECLARATION
-/**
-* This class encapsulates VPN related data in addition to a 'normal' 
-* access point. It provides Get/Set methods for every member.
-* Member set is not limited by the API.
-* It is used to read-write VPN data to and form CommsDb.
-* Main user is CVpnApEngine class but also UI might use this one.
-*/
-NONSHARABLE_CLASS( CVpnApItem ) : public CBase
-    { // holds VPN specific data
-
-    public:  // Constructors and destructor
-        /**
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack. Instance is initialised to default values.
-        * @return The constructed CApAccessPointItem.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CVpnApItem* NewLC();
-
-
-        /**
-        * Destructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C virtual ~CVpnApItem();
-
-        
-    protected:      // Constructors
-
-        /**
-        * Second-phase constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL();
-
-
-    private:    // Data
-        /**
-        * C++ default constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C CVpnApItem();
-
-
-
-    public:  // other public, exported functions
-        /**
-        * Copies the data from another CVpnApItem.
-        * Substitute for the "assignment operator". It requires allocation
-        * thus can leave.
-        * Wap Access Point Uid is not copied.
-        *
-        * @deprecated
-        */
-        IMPORT_C void CopyFromL( const CVpnApItem& aCopyFrom  );
-
-
-        /**
-        * Equality operator. Wap Access Point Uid is not counted.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool operator==( const CVpnApItem& aitem ) const;
-
-
-        /**
-        * Inequality operator. Wap Access Point Uid is not counted.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool operator!=( const CVpnApItem& aitem ) const;
-
-
-
-        /**
-        * This function reads up a 16-bit text value from the specified column.
-        * @param aColumn Enum value indicating the column to read.
-        * @param aValue Reference to a 16-bit descriptor to hold the value
-        * @return no return value
-        *
-        * @deprecated
-        */
-        IMPORT_C void ReadTextL( const TVpnApMember aColumn, TDes16& aValue );
-
-
-        /**
-        * This function reads up a long text value from the specified column.
-        * The ownership is not passed to the caller. It means that the caller
-        * should not delete the received value.
-        * If the caller must take the ownership for any reason, must make a
-        * copy and use that and delete the copy when no longer needed.
-        * @param aColumn Enum value indicating the column to read.
-        * @return A const HBufC* to the value.
-        *
-        * @deprecated
-        */
-        IMPORT_C const HBufC* ReadConstLongTextL( const TVpnApMember aColumn );
-
-
-        /**
-        * This function reads up a TUint32 value from the specified column.
-        * If the specified column does not exist (that is, not part of the
-        * database structure), it will Panic in debug builds and it will
-        * return KErrInvalidColumn in release builds without Panicking.
-        * Panic is used in debug builds because it indicates a programming
-        * error. In release, it 'notifies' the caller about the error through
-        * the return value but enables system to continue operation.
-        * @param aColumn Enum value indicating the column to read.
-        * @param aValue A reference to a TUint32 to hold the value
-        * @return Error code.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt ReadUint( const TVpnApMember aColumn, TUint32& aValue );
-
-        /**
-        * This function reads up a boolean value from the specified column.
-        * If the specified column does not exist (that is, not part of the
-        * database structure), it will Panic in debug builds and it will
-        * return KErrInvalidColumn in release builds without Panicking.
-        * Panic is used in debug builds because it indicates a programming
-        * error. In release, it 'notifies' the caller about the error through
-        * the return value but enables system to continue operation.
-        * @param aColumn Enum value indicating the column to read.
-        * @param aValue A reference to a boolean to hold the value
-        * @return Error code.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt ReadBool( const TVpnApMember aColumn, TBool& aValue );
-
-
-
-        /**
-        * This function writes a 16-bit text value to the specified column.
-        * If the specified column does not exist (that is, not part of the
-        * database structure), it will Panic in debug builds and it will
-        * return KErrInvalidColumn in release builds without Panicking.
-        * Panic is used in debug builds because it indicates a programming
-        * error. In release, it 'notifies' the caller about the error through
-        * the return value but enables system to continue operation.
-        * This function can Leave if the copying of the text does not succeed.
-        * @param aColumn Enum value indicating the column to write.
-        * @param aValue Reference to a 16-bit text descriptor to the value
-        * @return Error code.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt WriteTextL( const TVpnApMember aColumn,
-                                  const TDesC16& aValue );
-
-
-
-        /**
-        * This function writes a long text value to the specified column.
-        * If the specified column does not exist (that is, not part of the
-        * database structure), it will Panic in debug builds and it will
-        * return KErrInvalidColumn in release builds without Panicking.
-        * Panic is used in debug builds because it indicates a programming
-        * error. In release, it 'notifies' the caller about the error through
-        * the return value but enables system to continue operation.
-        * This function can Leave if the copying of the text does not succeed.
-        * @param aColumn Enum value indicating the column to write.
-        * @param aValue Reference to a 16-bit text descriptor to the value
-        * @return Error code.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt WriteLongTextL( const TVpnApMember aColumn,
-                                      const TDesC& aValue );
-
-
-        /**
-        * This function writes a TUint32 value to the specified column.
-        * If the specified column does not exist (that is, not part of the
-        * database structure), it will Panic in debug builds and it will
-        * return KErrInvalidColumn in release builds without Panicking.
-        * Panic is used in debug builds because it indicates a programming
-        * error. In release, it 'notifies' the caller about the error through
-        * the return value but enables system to continue operation.
-        * @param aColumn Enum value indicating the column to write.
-        * @param aValue A const reference to a TUint32 value
-        * @return Error code.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt WriteUint( const TVpnApMember aColumn,
-                                 const TUint32& aValue );
-
-        /**
-        * This function writes a boolean value to the specified column.
-        * If the specified column does not exist (that is, not part of the
-        * database structure), it will Panic in debug builds and it will
-        * return KErrInvalidColumn in release builds without Panicking.
-        * Panic is used in debug builds because it indicates a programming
-        * error. In release, it 'notifies' the caller about the error through
-        * the return value but enables system to continue operation.
-        * @param aColumn Enum value indicating the column to write.
-        * @param aValue A const reference to a boolean value
-        * @return Error code.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt WriteBool( const TVpnApMember aColumn,
-                                 const TBool& aValue );
-
-
-
-        // Query
-        // COMMON
-        /**
-        * This function returns the ID of the access point
-        * @return The ID of this access point
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 WapUid() const;
-
-
-        /**
-        * This function returns the name of the connection
-        * Ownership is not passed.
-        * @return The name of the connection
-        *
-        * @deprecated
-        */
-        IMPORT_C const TDesC& Name() const;
-
-protected:
-        /**
-        * Reallocates a passed 16-bit descriptor. Passed descriptor is deleted,
-        * new one is AllocL-ed
-        * Passed descriptor MUST NOT BE on the CleanupStack
-        */
-        void ReAllocL(HBufC*& aDes, const TDesC16& aValue);
-
-        
-        /**
-        * Removes invalid chars from the passed text
-        * Invalid chars are: TAB
-        * @return a HBufC16 holding the new text
-        */
-        HBufC* RemoveInvalidCharsLC( const TDesC16& aInText );
-
-
-        /**
-        * Returns whether this VPN access point has proxy data or not.
-        * 
-        */
-        TBool HasProxy() const;
-
-private:    // Data
-
-
-        HBufC*      iName;
-        TUint32     iVpnTableId;
-        TUint32     iVpnIapId;
-        TUint32     iRealIapId;
-
-        TUint32     iVpnRealWapId;
-        TUint32     iVpnWapId;
-
-        TUint32     iVirtualBearerID;
-
-        HBufC*      iPolicyId;
-
-        HBufC*      iPolicy;
-        HBufC*      iProxyServerAddress;
-        HBufC*      iRealIapName;
-        TUint32     iProxyPort;
-        TUint32     iHomeNetwork;
-        TUint32     iVpnIapNetwork;
-        HBufC*      iVpnIapNetworkName;
-
-
-    protected:  // Friend classes
-        friend class CVpnApEngine;
-
-    };
-
-
-
-#endif 
-
-// End of File
--- a/ipcm_plat/group/bld.inf	Wed Oct 27 17:43:56 2010 +0300
+++ b/ipcm_plat/group/bld.inf	Wed Oct 27 17:51:11 2010 +0300
@@ -15,7 +15,6 @@
 *
 */
 
-#include "../access_point_engine_misc_api/group/bld.inf"
 #include "../bearer_settings_plugin_api/group/bld.inf"
 #include "../commsdat_wlan_api/group/bld.inf"
 #include "../connection_monitor_extension_api/group/bld.inf"
--- a/ipcm_pub/access_point_engine_api/access_point_settings_handler_api.metaxml	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<api id="d7abf56e3fafedb47da958a6a793cd8d" dataversion="1.0">
-  <name>Access Point Settings Handler API</name>
-  <description>Provides applications with the possibility to include Access Point choice.</description>
-  <type>c++</type>
-  <subsystem>networkingutilities</subsystem>
-  <libs>
-    <lib name="apsettingshandlerui.lib" />
-  </libs>
-  <release category="sdk" sinceversion="0.9" deprecatedsince="3.2"/>
-  <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
-     <htmldocprovided>yes</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/ipcm_pub/access_point_engine_api/group/bld.inf	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,38 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  File that exports the files belonging to 
-:                Access Point Engine API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/APUtils.h     MW_LAYER_PUBLIC_EXPORT_PATH(ApUtils.h)
-../inc/APDataHandler.h     MW_LAYER_PUBLIC_EXPORT_PATH(ApDataHandler.h)
-../inc/ActiveApDb.h     MW_LAYER_PUBLIC_EXPORT_PATH(ActiveApDb.h)
-../inc/ApEngineConsts.h     MW_LAYER_PUBLIC_EXPORT_PATH(ApEngineConsts.h)
-../inc/ApEngineVer.h     MW_LAYER_PUBLIC_EXPORT_PATH(ApEngineVer.h)
-../inc/Aplistitemlist.h     MW_LAYER_PUBLIC_EXPORT_PATH(ApListItemList.h)
-../inc/ApNetworkItemlist.h     MW_LAYER_PUBLIC_EXPORT_PATH(ApNetworkItemList.h)
-../inc/ApListItem.h     MW_LAYER_PUBLIC_EXPORT_PATH(ApListItem.h)
-../inc/APSelect.h     MW_LAYER_PUBLIC_EXPORT_PATH(ApSelect.h)
-../inc/APNetworks.h     MW_LAYER_PUBLIC_EXPORT_PATH(ApNetworks.h)
-../inc/ApNetworkItem.h     MW_LAYER_PUBLIC_EXPORT_PATH(ApNetworkItem.h)
-../inc/APAccessPointItem.h     MW_LAYER_PUBLIC_EXPORT_PATH(ApAccessPointItem.h)
--- a/ipcm_pub/access_point_engine_api/inc/APAccessPointItem.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1307 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the class CApAccessPointItem
-*
-*/
-
-
-#ifndef ACCESSPOINTITEM_H
-#define ACCESSPOINTITEM_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
-
- 
-//  INCLUDES
-#include <etelmm.h>
-#include <cdbcols.h>
-#include <nifvar.h>
-#ifdef SYMBIAN_ENABLE_SPLIT_HEADERS
-#include <nifvar_internal.h>
-#endif
-#include <ApEngineVer.h>
-#include <ApEngineConsts.h>
-
-
-// DATA TYPES
-/**
-* This enum is used to identify the data when reading or writing
-* CApAccessPointItem data.
-* <br>Field types:
-* <br>
-*    8 - bit text:
-* <br>ReadTextL( const TApMember aColumn, TDes8& aValue )
-* <br>WriteTextL( const TApMember aColumn, const TDesC8& aValue )
-* <br>  EApIspIfCallbackInfo
-* <br>  EApIspInitString
-* <br>
-* <br>
-*    16-bit text:
-* <br>ReadTextL( const TApMember aColumn, TDes16& aValue )
-* <br>WriteTextL( const TApMember aColumn, const TDesC16& aValue )
-* <br>  EApWapAccessPointName
-* <br>  EApWapCurrentBearer
-* <br>  EApWapGatewayAddress
-* <br>  EApWapServiceCentreAddress
-* <br>  EApIapName
-* <br>  EApIapServiceType
-* <br>  EApIspName
-* <br>  EApIspDescription
-* <br>  EApIspDefaultTelNumber
-* <br>  EApIspLoginName
-* <br>  EApIspLoginPass
-* <br>  EApIspIfName
-* <br>  EApGprsIfName
-* <br>  EApIspIfParams
-* <br>  EApGprsIfParams
-* <br>  EApIspIfNetworks
-* <br>  EApGprsIfNetworks
-* <br>  EApIspIfAuthName
-* <br>  EApGprsIfAuthName
-* <br>  EApIspIfAuthPass
-* <br>  EApGprsIfAuthPassword
-* <br>  EApIspIPAddr
-* <br>  EApGprsIpAddr
-* <br>  EApIspIPNetMask
-* <br>  EApGprsIpNetMask
-* <br>  EApIspIPGateway
-* <br>  EApGprsIpGateway
-* <br>  EApIspIPNameServer1
-* <br>  EApGprsIPNameServer1
-* <br>  EApIspIPNameServer2
-* <br>  EApGprsIPNameServer2
-* <br>  EApGprsPdpAddress
-* <br>  EApProxyProtocolName
-* <br>  EApNetworkName
-* <br>  EApProxyLoginName
-* <br>  EApProxyLoginPass
-* <br>  EApIP6NameServer1
-* <br>  EApIP6NameServer2
-* <br>  EApLanBearerName
-* <br>
-* <br>Long text, 16 bit:
-* <br>const HBufC* ReadConstLongTextL( const TApMember aColumn )
-* <br>WriteLongTextL( const TApMember aColumn, const TDesC& aValue )
-* <br>  EApWapStartPage
-* <br>  EApIspLoginScript
-* <br>  EApGprsAccessPointName
-* <br>  EApProxyServerAddress
-* <br>  EApProxyExceptions
-* <br>
-* <br>Uint:
-* <br>ReadUint( const TApMember aColumn, TUint32& aValue )
-* <br>WriteUint( const TApMember aColumn, const TUint32& aValue )
-* <br>  EApWapAccessPointID
-
-// DEPRECATED
-* <br>  EApWapIsp
-
-// DEPRECATED
-* <br>  EApWapChargecard
-
-* <br>  EApWapIap
-
-// DEPRECATED
-* <br>  EApWapIspType
-
-* <br>  EApIapServiceId
-* <br>  EApIapChargecard
-* <br>  EApIspIspType
-* <br>  EApIspAuthRetries
-* <br>  EApGprsIfAuthRetries
-* <br>  EApIspIfCallbackType
-* <br>  EApIspCallBackTimeOut
-* <br>  EApIspBearerName
-* <br>  EApIspBearerSpeed
-* <br>  EApIspBearerCE
-* <br>  EApIspBearerType
-* <br>  EApIspBearerCallTypeIsdn
-* <br>  EApIspChannelCoding
-* <br>  EApIspAIUR
-* <br>  EApIspRequestedTimeSlots
-* <br>  EApIspMaximumTimeSlots
-* <br>  EApGprsPdpType
-* <br>  EApGprsReqPrecedence
-* <br>  EApGprsReqDelay
-* <br>  EApGprsReqReliability
-* <br>  EApGprsReqPeakThroughput
-* <br>  EApGprsReqMeanPeakThroughput
-* <br>  EApGprsMinPrecedence
-* <br>  EApGprsMinDelay
-* <br>  EApGprsMinReliability
-* <br>  EApGprsMinPeakThroughput
-* <br>  EApGprsMinMeanThroughput
-* <br>  EApWapWspOption
-* <br>  EApIspBearerCallTypeIsdn
-* <br>  EApProxyPortNumber
-* <br>  EApNetworkID
-* <br>  EApWapProxyPort
-* <br>  EApIapBearerService
-* <br>  EApIapBearerID
-* <br>
-* <br>Bool:
-* <br>ReadBool( const TApMember aColumn, TBool& aValue )
-* <br>WriteBool( const TApMember aColumn, const TBool& aValue )
-* <br>  EApWapSecurity
-* <br>  EApIspDialResolution
-* <br>  EApIspUseLoginScript
-* <br>  EApIspPromptForLogin
-* <br>  EApIspDisplayPCT
-* <br>  EApIspIfPromptForAuth
-* <br>  EApGprsIfPromptForAuth
-* <br>  EApIspIfCallbackEnabled
-* <br>  EApIspIPAddrFromServer
-* <br>  EApGprsIpAddrFromServer
-* <br>  EApIspIPDnsAddrFromServer
-* <br>  EApGprsIpDnsAddrFromServer
-* <br>  EApIspEnableIpHeaderComp
-* <br>  EApGprsHeaderCompression
-* <br>  EApIspEnableLCPExtensions
-* <br>  EApGprsEnableLCPExtensions
-* <br>  EApIspDisablePlainTextAuth
-* <br>  EApGprsDisablePlainTextAuth
-* <br>  EApIspEnableSWCompression
-* <br>  EApGprsDataCompression
-* <br>  EApGprsUseAnonymAccess
-* <br>  EApIsReadOnly
-* <br>  EApProxyUseProxy
-* <br>  EApHasProxySettings
-* <br>  EApIP6DNSAddrFromServer
-*/
-enum TApMember
-    {
-    // WAP Access Point Table
-    EApWapAccessPointID,            ///< The Uid of the access point.
-                                    ///< READ ONLY, assigned by the database.
-    EApWapAccessPointName,          ///< The name of the access point
-    EApWapCurrentBearer,            ///< Indicates the name of the table from
-                                    ///< which to read the bearer information
-    EApWapStartPage,                ///< WAP start page URL, LONG TEXT!
-
-    // WAP Common (present in both tables)
-    EApWapGatewayAddress,           ///< WAP gateway address (IP address)
-    EApWapWspOption,                ///< Enum value indicating whether
-                                    ///< connection-oriented or connectionless
-                                    ///< API should be used.
-                                    ///< Type is TCommsDbWapWspOption.
-    EApWapSecurity,                 ///< Attepmt secure WTLS connection to
-                                    ///< the gateway
-
-    // WAP IP Bearer Table
-//* DEPRECATED
-    EApWapIsp,                      ///< Identifier of the ISP to use if this
-                                    ///< is an ISP type database
-//* DEPRECATED
-    EApWapChargecard,               ///< Identifier for the chargecard to use
-                                    ///< if this is an ISP type database
-    EApWapIap,                      ///< Identifier of a record in the IAP
-                                    ///< table to be used if this is an IAP
-                                    ///< type database
-//* DEPRECATED
-    EApWapIspType,                  ///< Enum value indicating whether IAP/ISP
-                                    ///< is a dial in or a dial out
-
-    // WAP SMS Bearer Table
-    // EApSmsWapGatewayAddress is mapped to EApWapGatewayAddress,
-    // different enum needed only for being able to
-    // distinguish when editing...
-
-    // IAP Table
-    EApIapName,                     ///< The name of this IAP
-    EApIapServiceType,              ///< Name of service table in this IAP
-    EApIapServiceId,                ///< Identifier of service in this IAP
-    EApIapChargecard,               ///< Identifier of the chargecard in
-                                    ///< this IAP
-
-    // ISP table
-    EApIspName,                     ///< The name of this ISP
-    EApIspDescription,              ///< Application's description of this ISP
-    EApIspIspType,                  ///< Enum value indicating ISP type, e.g.
-                                    ///< Internet ISP, WAP Isp.TCommsDbIspType.
-    EApIspDefaultTelNumber,         ///< Default phone number
-    EApIspDialResolution,           ///< Perform dialing resolution for default
-                                    ///< phone number?
-    EApIspUseLoginScript,           ///< Use login script?
-    EApIspLoginScript,              ///< Login script (used only if Use Login
-                                    ///< Script is true), LONG TEXT.
-    EApIspPromptForLogin,           ///< Prompt user for username and password?
-    EApIspLoginName,                ///< Login name
-    EApIspLoginPass,                ///< Login password
-    EApIspDisplayPCT,               ///< Display PCT (without scanning script
-                                    ///< for READ command) UNUSED, always FALSE
-    EApIspIfName,                   ///< Interface name
-    EApIspIfParams,                 ///< Interface parameter string
-    EApIspIfNetworks,               ///< Comma separated list of network
-                                    ///< protocols
-    EApIspIfPromptForAuth,          ///< Prompt user for authentication
-                                    ///< username and password?
-    EApIspIfAuthName,               ///< Authentication username used by PPP
-    EApIspIfAuthPass,               ///< Authentication password used by PPP
-    EApIspAuthRetries,              ///< Number of times to retry
-                                    ///< authentication if it fails
-    EApIspIfCallbackEnabled,        ///< Is callback enabled?
-    EApIspIfCallbackType,           ///< Enum value indicating the type of
-                                    ///< callback (if enabled).
-                                    ///< enum TCallbackAction.
-    EApIspIfCallbackInfo,           ///< Info for callback request (if enabled)
-                                    ///< 8-bit text field.
-    EApIspCallBackTimeOut,          ///< Time to wait for callback in
-                                    ///< microseconds (if enabled)
-    EApIspIPAddrFromServer,         ///< Get IP address from server?
-    EApIspIPAddr,                   ///< IP address of interface
-    EApIspIPNetMask,                ///< IP net mask of interface
-    EApIspIPGateway,                ///< IP address of gateway
-    EApIspIPDnsAddrFromServer,      ///< Get DNS address from server?
-    EApIspIPNameServer1,            ///< IP address of primary name server
-    EApIspIPNameServer2,            ///< IP address of secondary name server
-    EApIspEnableIpHeaderComp,       ///< Enable IP header compression?
-    EApIspEnableLCPExtensions,      ///< Enable LCP extensions?
-    EApIspDisablePlainTextAuth,     ///< Disable plain text authentication?
-    EApIspEnableSWCompression,      ///< Enable software compression?
-    EApIspBearerName,               ///< Enum value specifying the name of the
-                                    ///< bearer, e.g. Asunchronous Modem,
-                                    ///< RBasicGsmCall::TBearerName
-    EApIspBearerSpeed,              ///< Enum value specifying the bearer speed
-                                    ///< TApCallSpeed.
-    EApIspBearerCallTypeIsdn,       ///< call type is ISDN or Analogue...
-    EApIspBearerCE,                 ///< Enum value specifying the bearer CE,
-                                    ///< RBasicGsmCall::TBearerCE
-    EApIspInitString,               ///< Modem initialization string to be used
-                                    ///< when this ISP is in use.This string
-                                    ///< will be copied into the
-                                    ///< MODEM_ISP_INIT_STRING field by
-                                    ///< NetDial. 8-bit text field.
-    EApIspBearerType,               ///< Enum value indicating connection type
-                                    ///< (CSD or HSCSD), TCommsDbBearerType
-    EApIspChannelCoding,            ///< Enum value specifying HSCSD channel
-                                    ///< coding
-    EApIspAIUR,                     ///< Enum value specifying AIUR for HSCSD
-    EApIspRequestedTimeSlots,       ///< Requested number of time slots for
-                                    ///< HSCSD
-    EApIspMaximumTimeSlots,         ///< Maximum number of time slots for HSCSD
-                                    ///< which could be requested during this
-                                    ///< connection
-
-    EApGprsAccessPointName,         ///< Access Point Name, LONG TEXT!
-    EApGprsPdpType,                 ///< PDP type
-    EApGprsPdpAddress,              ///< PDP address
-    EApGprsReqPrecedence,           ///< Requested quality of service
-                                    ///< precedence class
-    EApGprsReqDelay,                ///< Requested quality of service
-                                    ///< delay class
-    EApGprsReqReliability,          ///< Requested quality of service
-                                    ///< reliability class
-    EApGprsReqPeakThroughput,       ///< Requested quality of service
-                                    ///< peak throughput class
-    EApGprsReqMeanPeakThroughput,   ///< Requested quality of service
-                                    ///< mean throughput class
-    EApGprsMinPrecedence,           ///< Minimum quality of service
-                                    ///< precedence class
-    EApGprsMinDelay,                ///< Minimum quality of service
-                                    ///< delay class
-    EApGprsMinReliability,          ///< Minimum quality of service
-                                    ///< reliability class
-    EApGprsMinPeakThroughput,       ///< Minimum quality of service
-                                    ///< peak throughput class
-    EApGprsMinMeanThroughput,       ///< Minimum quality of service
-                                    ///< mean throughput class
-    EApGprsUseAnonymAccess,         ///< Use anonymous access on?
-
-    // followings are mapped to ISP... fields
-    EApGprsDataCompression,         ///< Data compression on?
-    EApGprsHeaderCompression,       ///< IP header compression on?
-    EApGprsIfName,                  ///< Interface name
-    EApGprsIfParams,                ///< Interface parameter string
-    EApGprsIfNetworks,              ///< Comma separated list of network
-                                    ///< protocols
-    EApGprsIfPromptForAuth,         ///< Prompt user for authentication
-                                    ///< username and password?
-    EApGprsIfAuthName,              ///< Authentication username used by PPP
-    EApGprsIfAuthPassword,          ///< Authentication password used by PPP
-    EApGprsIfAuthRetries,           ///< Number of times to retry
-                                    ///< authentication if it fails
-    EApGprsIpNetMask,               ///< IP net mask of interface
-    EApGprsIpGateway,               ///< IP address of gateway
-    EApGprsIpAddrFromServer,        ///< Get IP adresses (for Symbian OS)
-                                    ///< from server?
-    EApGprsIpAddr,                  ///< IP address of Symbian OS
-    EApGprsIpDnsAddrFromServer,     ///< Get DNS addresses from server?
-    EApGprsIPNameServer1,           ///< IP address of primary name server
-    EApGprsIPNameServer2,           ///< IP address of secondary name server
-    EApGprsEnableLCPExtensions,     ///< Enable LCP extension?
-    EApGprsDisablePlainTextAuth,    ///< Disable plain text authentication?
-    EApIsReadOnly                   ///< Is the current record read only?
-
-
-// expanding this enum is safe and will not cause any trouble as all public 
-// part of this module uses it as a const parameter and NEVER as 
-// a return value, therefore non-aware clients will NEVER meet with the new
-// ones, thus it can not cause any problems that they do not expect them...
-    ,
-    EApProxyServerAddress,          ///< Proxy server address, long text
-    EApProxyProtocolName,           ///< Proxy protocol name, Text
-    EApProxyPortNumber,             ///< Proxy port number,  TUint32
-    EApProxyUseProxy,               ///< Use proxy server?, TBool 
-    EApProxyExceptions,             ///< ';' separated list of addr. for wich 
-                                    ///< the server should not be used. 
-                                    ///< Long text
-    EApHasProxySettings,            ///< Has proxy settings? READ ONLY.
-    EApNetworkID,                   ///< The network ID
-    EApNetworkName,                 ///< The network name
-
-    EApWapProxyPort,                ///< The wap proxy port number
-    EApProxyLoginName,              ///< The proxy login name
-    EApProxyLoginPass,              ///< The proxy login password
-    EApIapBearerService,            ///< Bearer service
-
-    EApIP6DNSAddrFromServer,        ///< Get IPv6 DNS addresses from server?
-    EApIP6NameServer1,              ///< IP address of primary name server
-    EApIP6NameServer2,              ///< IP address of secondary name server
-
-    // CDMA2000
-    EApCdmaIwfName,                 ///< IWF name, Text
-    EApCdmaServiceOption,           ///< Service Option, TUint32
-    EApCdmaPdpType,                 ///< PDP type, TUin32
-    EApCdmaPdpAddress,              ///< PDP address, Text
-    EApCdmaReqFwdPriority,          ///< Requested forward priority, TUint32
-    EApCdmaReqRevPriority,          ///< Requested reverse priority, TUint32
-    EApCdmaReqFwdBitrate,           ///< Requested forward bitrate, TUint32
-    EApCdmaReqRevBitrate,           ///< Requested reverse bitrate, TUint32
-    EApCdmaReqFwdLoss,              ///< Req. forward frame loss rate, TUint32
-    EApCdmaReqRevLoss,              ///< Req. reverse frame loss rate, TUint32
-    EApCdmaReqFwdMaxDelay,          ///< Requested forward delay, TUint32
-    EApCdmaReqRevMaxDelay,          ///< Requested reverse delay, TUint32
-    EApCdmaMinFwdBitrate,           ///< Min. acceptable fwd bitrate, TUint32
-    EApCdmaMinRevBitrate,           ///< Min. acceptable rev bitrate, TUint32
-    EApCdmaAccptFwdLoss,            ///< Max. acc. fwd frame loss rate, TUint32
-    EApCdmaAccptRevLoss,            ///< Max. acc. rev frame loss rate, TUint32
-    EApCdmaAccptFwdMaxDelay,        ///< Max. acceptable forward delay, TUint32
-    EApCdmaAccptRevMaxDelay,        ///< Max. acceptable reverse delay, TUint32
-
-    // CDMA2000, mapped to ISP... fields
-    EApCdmaDataCompression,         ///< Data compression on? TBool
-    EApCdmaHeaderCompression,       ///< IP header compression on? TBool
-    EApCdmaAnonymousAccess,         ///< Use anonymous access on? TBool
-    EApCdmaIfName,                  ///< Interface name
-    EApCdmaIfParams,                ///< Interface parameter string
-    EApCdmaIfNetworks,              ///< Comma separated list of network
-                                    ///< protocols
-    EApCdmaIfPromptForAuth,         ///< Prompt user for authentication
-                                    ///< username and password?
-    EApCdmaIfAuthName,              ///< Authentication username used by PPP
-    EApCdmaIfAuthPassword,          ///< Authentication password used by PPP
-    EApCdmaIfAuthRetries,           ///< Number of times to retry
-                                    ///< authentication if it fails
-    EApCdmaIpNetMask,               ///< IP net mask of interface
-    EApCdmaIpGateway,               ///< IP address of gateway
-    EApCdmaIpAddrFromServer,        ///< Get IP adresses (for Symbian OS)
-                                    ///< from server?
-    EApCdmaIpAddr,                  ///< IP address of Symbian OS
-    EApCdmaIpDnsAddrFromServer,     ///< Get DNS addresses from server?
-    EApCdmaIPNameServer1,           ///< IP address of primary name server
-    EApCdmaIPNameServer2,           ///< IP address of secondary name server
-    EApCdmaEnableLCPExtensions,     ///< Enable LCP extension?
-    EApCdmaDisablePlainTextAuth,    ///< Disable plain text authentication?
-
-    // CDMA2000
-    EApCdmaApType,                  ///< Internet / WAP or both? TUint32
-    EApCdmaQosWarningTimeout,       ///< Notify user if the requested QOS
-                                    ///< cannot be satisfied for this time in
-                                    ///< microseconds, TUint32
-    EApCdmaRlpMode,                 ///< Transparent or non-transparent
-                                    ///< radio link protocol, TUint32
-    // CDMA2000 deprecated Mobile IP fields
-    EApCdmaMip,                     ///< Attempt to use mobile IP, TBool
-    EApCdmaHomeAgentAddress,        ///< Home Agent address, Text
-    EApCdmaMipTimeout,              ///< A normal reconnect (informing the
-                                    ///< user) takes place if both the PPP link
-                                    ///< drops and a change in SID or NID is
-                                    ///< received within this time in
-                                    ///< milliseconds, TUint32
-    // CDMA2000 specific CDMA parameters provisioned through OTA and defined
-    // in TIA-683B section 3.5.8
-    // These fields replace the old Mobile IP fields (above).
-    EApCdmaNaiType,                 ///< Type of NAI, TUint32
-    EApCdmaSimpleIpAuthAlgorithm,   ///< SimpleIP auth.algorithm, TUint32
-    EApCdmaSimpleIpPapSsHandle,     ///< SimpleIP PAP shared secret handle,
-                                    ///< TUint32
-    EApCdmaSimpleIpChapSsHandle,    ///< SimpleIP CHAP shared secret handle,
-                                    ///< TUint32
-    EApCdmaMipTBit,                 ///< Reverse-tunneling reqd flag, TUint32
-    EApCdmaMipHomeAddress,          ///< Home address, Text
-    EApCdmaMipPrimaryHomeAgent,     ///< IP address of mobile node's
-                                    ///< primary home agent, Text
-    EApCdmaMipSecondaryHomeAgent,   ///< IP address of mobile node's
-                                    ///< secondary home agent, Text
-    EApCdmaMipMnAaaAuthAlgorithm,   ///< MN-AAA auth algorithm, TUint32
-    EApCdmaMipMnAaaSpi,             ///< MN-AAA security param index, TUint32
-    EApCdmaMipMnAaaSsHandle,        ///< MN-AAA shared secret handle, TUint32
-    EApCdmaMipMnHaAuthAlgorithm,    ///< MN-HA auth algorithm, TUint32
-    EApCdmaMipMnHaSpi,              ///< MN-HA security param index, TUint32
-    EApCdmaMipMnHaSsHandle,         ///< MN-HA shared secret handle, TUint32
-    
-
-    // WLAN specific fields
-    EApWlanNetworkName,             ///< The network name, Text
-    EApWlanNetworkMode,             ///< Gives network mode, TUint32
-    EApWlanSecurityMode,            ///< The security mode, TUint32
-
-    // WLAN, mapped to ISP... fields
-    EApWlanIfNetworks,              ///< Comma separated list of network
-                                ///< protocols
-    EApWlanIfPromptForAuth,         ///< Prompt user for authentication
-                                ///< username and password?
-    EApWlanIfAuthName,              ///< Authentication username used by PPP
-    EApWlanIfAuthPassword,          ///< Authentication password used by PPP
-    EApWlanIfAuthRetries,           ///< Number of times to retry
-                                ///< authentication if it fails
-    EApWlanIpNetMask,               ///< IP net mask of interface
-    EApWlanIpGateway,               ///< IP address of gateway
-    EApWlanIpAddrFromServer,        ///< Get IP adresses (for Symbian OS)
-                                    ///< from server?
-    EApWlanIpAddr,                  ///< IP address of Symbian OS
-    EApWlanIpDnsAddrFromServer,     ///< Get DNS addresses from server?
-    EApWlanIPNameServer1,           ///< IP address of primary name server
-    EApWlanIPNameServer2,           ///< IP address of secondary name server
-    EApWlanSettingsId,              ///< COMMDB_ID of the WLAN settings,
-                                    ///< TUint32
-    EApWlanScanSSID,                ///< TBool, whether need to scan the SSID
-    EApWlanChannelId,               ///< In ad-hoc network mode, the channel  
-                                    ///< ID, TUint32
-    EApLanBearerName,               ///< The name of the LAN bearer
-    EApIapBearerID,                 ///< UID of the bearer record (LAN/Modem)
-    EApIapBearerType,               ///< The name of the iap bearer 
-                                    ///< table (LAN/Modem)
-    // some defines for UI ONLY, NOT TO BE USED BY ANYONE ELSE!!!
-    EApIpv4Settings = 0x00010000,
-    EApIpv6Settings,
-    EApWlanSecuritySettings         ///< The security settings launcher
-    };
-
-
-
-// CONSTANTS
-// D E P R E C A T E D,  please do not use it!!!!!!!!!!
-// can not remove as it was part of the public API...
-const TInt KApMemberNum = EApGprsDisablePlainTextAuth+1;
-
-// FORWARD
-class CApItemExtra;
-
-// CLASS DECLARATION
-
-
-/**
-* CApAccessPointItem is used to exchange data between engine and client.
-* It holds the information for an access point including WAP, IAP, ISP
-* (if present & applies).
-* This class uses the same approach as CommDB to read and write data: it
-* has functions for each data type implemented. To read or write the data,
-* we have to know the data type and the enum name of the 'column'.
-* The column values has the names of the database columns with the 'EAp'
-* prefix. The reason for this (not using the database column descriptors)
-* is performance. It is much faster to compare enum values than literals.
-*/
-class CApAccessPointItem :public CBase
-    {
-
-    public:  // Constructors and destructor
-        /**
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack. Instance is initialised to default values.
-        * The created instance is suitable for passing to CApDataHandler's
-        * functions, contains all necessary information.
-        * @return The constructed CApAccessPointItem.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApAccessPointItem* NewLC();
-
-
-        /**
-        * Destructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C virtual ~CApAccessPointItem();
-
-
-        /**
-        * Copies the data from another CApAccessPointItem.
-        * Substitute for the "assignment operator". It requires allocation
-        * thus can leave.
-        * Wap Access Point Uid is not copied.
-        *
-        * @deprecated
-        */
-        IMPORT_C void CopyFromL( const CApAccessPointItem& aCopyFrom  );
-
-
-        /**
-        * Equality operator. Wap Access Point Uid is not counted.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool operator==( const CApAccessPointItem& aitem ) const;
-
-
-        /**
-        * Inequality operator. Wap Access Point Uid is not counted.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool operator!=( const CApAccessPointItem& aitem ) const;
-
-
-    protected:      // Constructors
-
-        /**
-        * C++ default constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C CApAccessPointItem();
-
-        /**
-        * Second-phase constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL();
-
-
-
-
-    public: // New functions
-
-
-        /**
-        * This function reads up an 8-bit text value from the specified column.
-        * @param aColumn Enum value indicating the column to read.
-        * @param aValue Reference to an 8-bit descriptor to hold the value
-        * @return no return value
-        *
-        * @deprecated
-        */
-        IMPORT_C void ReadTextL( const TApMember aColumn, TDes8& aValue );
-
-        /**
-        * This function reads up a 16-bit text value from the specified column.
-        * @param aColumn Enum value indicating the column to read.
-        * @param aValue Reference to a 16-bit descriptor to hold the value
-        * @return no return value
-        *
-        * @deprecated
-        */
-        IMPORT_C void ReadTextL( const TApMember aColumn, TDes16& aValue );
-
-        /**
-        * NOTE: This function is deprecated. Use ReadConstLongTextL!
-        * This function reads up a long text value from the specified column.
-        * The ownership is not passed to the caller. It means that the caller
-        * should not delete the received value.
-        * If the caller must take the ownership for any reason, must make a
-        * copy and use that and delete the copy when no longer needed.
-        * @param aColumn Enum value indicating the column to read.
-        * @return A HBufC* to the value.
-        *
-        * @deprecated
-        */
-        IMPORT_C HBufC* ReadLongTextL( const TApMember aColumn );
-
-
-        /**
-        * This function reads up a long text value from the specified column.
-        * The ownership is not passed to the caller. It means that the caller
-        * should not delete the received value.
-        * If the caller must take the ownership for any reason, must make a
-        * copy and use that and delete the copy when no longer needed.
-        * @param aColumn Enum value indicating the column to read.
-        * @return A const HBufC* to the value.
-        *
-        * @deprecated
-        */
-        IMPORT_C const HBufC* ReadConstLongTextL( const TApMember aColumn );
-
-
-
-        /**
-        * This function reads the length of the text in the specified column.
-        * @param aColumn Enum value indicating the column to read.
-        * @return The length of the text in that column.
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 ReadTextLengthL( const TApMember aColumn );
-
-
-        /**
-        * This function reads up a TUint32 value from the specified column.
-        * In case the given value was not written to the database,
-        * it will return KErrValueUnspecified.
-        * If the specified column does not exist (that is, not part of the
-        * database structure), it will Panic in debug builds and it will
-        * return KErrInvalidColumn in release builds without Panicking.
-        * Panic is used in debug builds because it indicates a programming
-        * error. In release, it 'notifies' the caller about the error through
-        * the return value but enables system to continue operation.
-        * @param aColumn Enum value indicating the column to read.
-        * @param aValue A reference to a TUint32 to hold the value
-        * @return Error code.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt ReadUint( const TApMember aColumn, TUint32& aValue );
-
-        /**
-        * This function reads up a boolean value from the specified column.
-        * If the specified column does not exist (that is, not part of the
-        * database structure), it will Panic in debug builds and it will
-        * return KErrInvalidColumn in release builds without Panicking.
-        * Panic is used in debug builds because it indicates a programming
-        * error. In release, it 'notifies' the caller about the error through
-        * the return value but enables system to continue operation.
-        * @param aColumn Enum value indicating the column to read.
-        * @param aValue A reference to a boolean to hold the value
-        * @return Error code.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt ReadBool( const TApMember aColumn, TBool& aValue );
-
-
-        // Update
-        /**
-        * This function writes an 8-bit text value to the specified column.
-        * If the specified column does not exist (that is, not part of the
-        * database structure), it will Panic in debug builds and it will
-        * return KErrInvalidColumn in release builds without Panicking.
-        * Panic is used in debug builds because it indicates a programming
-        * error. In release, it 'notifies' the caller about the error through
-        * the return value but enables system to continue operation.
-        * This function can Leave if the copying of the text does not succeed.
-        * Possible leave codes are the system leave codes.
-        * @param aColumn Enum value indicating the column to write.
-        * @param aValue Reference to an 8-bit text descriptor to the value
-        * @return Error code.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt WriteTextL( const TApMember aColumn,
-                                const TDesC8& aValue );
-
-        /**
-        * This function writes a 16-bit text value to the specified column.
-        * If the specified column does not exist (that is, not part of the
-        * database structure), it will Panic in debug builds and it will
-        * return KErrInvalidColumn in release builds without Panicking.
-        * Panic is used in debug builds because it indicates a programming
-        * error. In release, it 'notifies' the caller about the error through
-        * the return value but enables system to continue operation.
-        * This function can Leave if the copying of the text does not succeed.
-        * @param aColumn Enum value indicating the column to write.
-        * @param aValue Reference to a 16-bit text descriptor to the value
-        * @return Error code.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt WriteTextL( const TApMember aColumn,
-                                const TDesC16& aValue );
-
-        /**
-        * This function writes a long text value to the specified column.
-        * If the specified column does not exist (that is, not part of the
-        * database structure), it will Panic in debug builds and it will
-        * return KErrInvalidColumn in release builds without Panicking.
-        * Panic is used in debug builds because it indicates a programming
-        * error. In release, it 'notifies' the caller about the error through
-        * the return value but enables system to continue operation.
-        * This function can Leave if the copying of the text does not succeed.
-        * @param aColumn Enum value indicating the column to write.
-        * @param aValue Reference to a 16-bit text descriptor to the value
-        * @return Error code.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt WriteLongTextL( const TApMember aColumn,
-                                    const TDesC& aValue );
-
-        /**
-        * This function writes a TUint32 value to the specified column.
-        * If the specified column does not exist (that is, not part of the
-        * database structure), it will Panic in debug builds and it will
-        * return KErrInvalidColumn in release builds without Panicking.
-        * Panic is used in debug builds because it indicates a programming
-        * error. In release, it 'notifies' the caller about the error through
-        * the return value but enables system to continue operation.
-        * @param aColumn Enum value indicating the column to write.
-        * @param aValue A const reference to a TUint32 value
-        * @return Error code.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt WriteUint( const TApMember aColumn,
-                                const TUint32& aValue );
-
-        /**
-        * This function writes a boolean value to the specified column.
-        * If the specified column does not exist (that is, not part of the
-        * database structure), it will Panic in debug builds and it will
-        * return KErrInvalidColumn in release builds without Panicking.
-        * Panic is used in debug builds because it indicates a programming
-        * error. In release, it 'notifies' the caller about the error through
-        * the return value but enables system to continue operation.
-        * @param aColumn Enum value indicating the column to write.
-        * @param aValue A const reference to a boolean value
-        * @return Error code.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt WriteBool( const TApMember aColumn,
-                                const TBool& aValue );
-
-
-        // Query
-        // COMMON
-        /**
-        * This function returns the ID of the access point
-        * @return The ID of this access point
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 WapUid() const;
-
-
-        /**
-        * This function returns the name of the connection
-        * Ownership is not passed.
-        * @return The name of the connection
-        *
-        * @deprecated
-        */
-        IMPORT_C const TDesC& ConnectionName() const;
-
-
-        // WAP-spec.
-        /**
-        * This function returns the current WAP bearer for the access point
-        * Ownership is not passed.
-        * @return The current WAP bearer for the access point
-        *
-        * @deprecated
-        */
-        IMPORT_C const TDesC& WapBearer() const;
-
-
-        /**
-        * This function returns the bearer type for the current access point
-        * @return The current bearer type for the access point
-        *
-        * @deprecated
-        */
-        IMPORT_C TApBearerType BearerTypeL();
-
-
-        /**
-        * This function sets the bearer type for the current access point
-        * @param aBearer TApBearerType enum indicating the desired bearer type.
-        * @return No return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void SetBearerTypeL( TApBearerType aBearer );
-
-
-        /**
-        * This function writes a 16-bit text value to the 'name' fields
-        * of the access point.
-        * This includes: WAP_ACCESS_POINT, IAP, Dial/in/out/Gprs In/Out
-        * table's COMM_DB_NAME fields.
-        * These fields are (by TApMember): EApWapAccessPointName, EApIapName,
-        * EApIspName.
-        * It is useful if we need to use same names.
-        * @param aValue A const reference to a 16-bit text descriptor to
-        * the value.
-        * @return No return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void SetNamesL( const TDesC16& aValue );
-
-
-        /**
-        * This function checks the integrity of the CApAccessPointItem.
-        * Currently checks:
-        * IF WAP_IP_BEARER, WAP_ISP_TYPE conforms to IAP_SERVICE_TYPE
-        * @return Boolean indicating whether the sanity check has
-        * passed(ETrue) or not(EFalse)
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool SanityCheckOk();
-
-
-        /**
-        * This function compares this and the passed CApAccessPointItem
-        * whether they have the same ISP and bearer
-        * Returns true if the APs have the same phone number
-        * @param aItem a CApAccessPointItem to compare with
-        * @return whether the APs have the same isp and bearer
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool HasSameIspAndBearerL( CApAccessPointItem& aItem );
-
-        /**
-        * This function returns whether the access point is read-only or not.
-        * @return Whether the current access point is read-only or not.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool IsReadOnly() const;
-
-    public: // public, not exported, available only inside the ApEngine dll
-        /**
-        * Returnes whether the given access point is a VPN ap or not.
-        */
-        TBool IsVpnAp() const;
-
-        /**
-        * Sets the current access point as VPN or as normal AP.
-        * Internal use only!
-        * @param aIsVpn a TBool specifiyng that the current AP is VPN or not.
-        */
-        void SetVpnAp( TBool aIsVpn );
-
-    private:
-        /**
-        * Returns whether a given member is specified (after reading it from
-        * the DB) or not.
-        * @param aMember The member we would like to knopw if it is specified 
-        * or not.
-        * @return whether a given member is specified (after reading it from
-        * the DB) or not.
-        */
-        TBool Specified( TApMember aMember );
-
-        /**
-        * Sets a given member as specified or not
-        * @param aMember The member to set
-        * @param aOn The value to set
-        */
-        void Specify( TApMember aMember, TBool aOn );
-
-        /**
-        * Sets all WAP member as specified or not
-        * @param aOn The value to set
-        */
-        void SpecifyWap( TBool aOn );
-
-        /**
-        * Sets all IP bearer member as specified or not
-        * @param aOn The value to set
-        */
-        void SpecifyIpBearer( TBool aOn );
-
-        /**
-        * Sets all IAP member as specified or not
-        * @param aOn The value to set
-        */
-        void SpecifyIAP( TBool aOn );
-
-        /**
-        * Sets all ISP member as specified or not
-        * @param aOn The value to set
-        */
-        void SpecifyISP( TBool aOn );
-
-        /**
-        * Sets all GPRS member as specified or not
-        * @param aOn The value to set
-        */
-        void SpecifyGPRS( TBool aOn );
-
-        /**
-        * Sets all CDMA member as specified or not
-        * @param aOn The value to set
-        */
-        void SpecifyCDMA( TBool aOn );
-
-        /**
-        * Sets all WLAN member as specified or not
-        * @param aOn The value to set
-        */
-        void SpecifyWLAN( TBool aOn );
-
-        /**
-        * Sets all member as specified or not
-        * @param aOn The value to set
-        */
-        void SpecifyAll( TBool aOn );
-
-        /**
-        * Sets iGetDNSIPFromServer according the currently valid iPrimaryDNS
-        * & iSecondaryDNS values. Called internally, after every setting of
-        * the above two values
-        */
-        void SetDnsIpFromServer();
-
-        /**
-        * Sets iIspIPAddrFromServer according the currently valid iIspIPAddr
-        * value. Called internally, after every setting of iIspIPAddr values
-        */
-        void SetIpFromServer();
-
-
-        /**
-        * Sets iExt->iIpv6GetDNSIPFromServer according the currently valid 
-        * iExt->iIpv6PrimaryDNS & iExt->iIpv6SecondaryDNS values.
-        * Called internally, after every setting of the above two values
-        */
-        void SetDns6IpFromServer();
-
-
-        /**
-        * Reallocates a passed 16-bit descriptor. Passed descriptor is deleted,
-        * new one is AllocL-ed
-        * Passed descriptor MUST NOT BE on the CleanupStack
-        * @param aDes The descriptor to hold the value
-        * @param aValue The value to pass to the aDes descriptor.
-        */
-        void ReAllocL(HBufC*& aDes, const TDesC16& aValue);
-
-        /**
-        * Reallocates a passed 8-bit descriptor. Passed descriptor is deleted,
-        * new one is AllocL-ed
-        * Passed descriptor MUST NOT BE on the CleanupStack
-        * @param aDes The descriptor to hold the value
-        * @param aValue The value to pass to the aDes descriptor.
-        */
-        void ReAllocL(HBufC8*& aDes, const TDesC8& aValue);
-
-
-        /**
-        * Compares THIS and the passed aItem.
-        * @param aItem The item to compare this to
-        * @return Whether the item is equal with this or not
-        */
-        TBool DoCompareApL( const CApAccessPointItem& aItem ) const;
-
-
-        /**
-        * Compares the WAP part of THIS and the passed aItem.
-        * Does not compares IAP ID
-        * @param aItem The item to compare this to
-        * @return Whether the WAP part is equal with this or not
-        */
-        TBool CompareWap( const CApAccessPointItem& aItem ) const;
-
-
-        /**
-        * Compares the IAP part of THIS and the passed aItem.
-        * @param aItem The item to compare this to
-        * @return Whether the IAP part is equal with this or not
-        */
-        TBool CompareIap( const CApAccessPointItem& aItem ) const;
-
-
-        /**
-        * Compares the IsP part of THIS and the passed aItem.
-        * @param aItem The item to compare this to
-        * @return Whether the ISP part is equal with this or not
-        */
-        TBool CompareIsp( const CApAccessPointItem& aItem ) const;
-
-
-        /**
-        * Compares the Gprs part of THIS and the passed aItem.
-        * @param aItem The item to compare this to
-        * @return Whether the GPRS part is equal with this or not
-        */
-        TBool CompareGprs( const CApAccessPointItem& aItem ) const;
-
-
-        /**
-        * Compares the Cdma part of THIS and the passed aItem.
-        * @param aItem The item to compare this to
-        * @return Whether the CDMA part is equal with this or not        
-        */
-        TBool CompareCdma( const CApAccessPointItem& aItem ) const;
-
-
-        /**
-        * Compares the Wlan part of THIS and the passed aItem.
-        * @param aItem The item to compare this to
-        * @return Whether the WLAN part is equal with this or not
-        */
-        TBool CompareWlan( const CApAccessPointItem& aItem ) const;
-
-
-        /**
-        * Removes leading 0s from the passed IP address.
-        * @param aValue A descriptor holding the IP address to remove
-        * leading 0s from
-        * @return A newly allocated HBufC holding the resulting string.
-        */
-        HBufC* GetCleanIpAddressLC( const TDesC& aValue );
-
-
-
-        /**
-        * Removes invalid chars e.g. space, () from the passed phone number.
-        * (valid are 0,1,2,..9,p,w,+,*,#)
-        * Strips pre- and postfixes, prefix separator is#,
-        * postfix separators are p, w or +
-        * @param aValue A descriptor holding the phone number
-        * @return A newly allocated HBufC holding the resulting string.
-        */
-        HBufC* GetPlainPhoneNumberLC( const TDesC& aNumber );
-
-
-        /**
-        * Compares the 'default phone number' (ISP dial-in number) of this
-        * and the passed CApAccessPointItem
-        * @param aItem The item to compare this to
-        * @return a TBool indicating whether the phone numbers are
-        * the same or not.
-        */
-        TBool IsSamePhoneNumberL( CApAccessPointItem& aItem );
-
-
-        /**
-        * Removes invalid chars from the passed phone number
-        * @param aIntext Text to remove invalid characters from phone number
-        * @return a HBufC holding the new text
-        */
-        HBufC* RemoveInvalidPhoneCharsLC( const TDesC16& aInText );
-
-
-        /**
-        * Removes invalid chars from the passed text
-        * Invalid chars are: TAB
-        * @param aIntext Text to remove invalid characters from        
-        * @return a HBufC16 holding the new text
-        */
-        HBufC* RemoveInvalidCharsLC( const TDesC16& aInText );
-
-
-        /**
-        * Removes invalid chars from the passed text
-        * Invalid chars are: TAB
-        * @param aIntext Text to remove invalid characters from        
-        * @return a HBufC8 holding the new text
-        */
-        HBufC8* RemoveInvalidCharsLC( const TDesC8& aInText );
-
-
-        /**
-        * Compares the proxy data of this and the passed CApAccessPointItem.
-        * @param aItem The item to compare this to
-        * @return Whether the Proxy part is equal with this or not
-        */
-        TBool CompareProxy( const CApAccessPointItem& aItem ) const;
-
-
-        /**
-        * Returns whether the Ap has proxy data or not.
-        * @return Whether the Ap has proxy data or not.
-        */
-        TBool HasProxy() const;
-
-
-        /**
-        * Sets the proxy flag.
-        */
-        void SetProxyFlag();
-
-
-        /**
-        * Limits the speed after changing e.g. bearer type
-        */
-        void LimitSpeedL();
-
-
-        /**
-        * Sets the IfNetworks value according to the bearer type and 
-        * the IPv6 support availability. The required values are:
-        * IPv4:
-        *   GPRS/CDMA, pdptype ipv4 "ip",
-        *   CSD                     "ip"
-        *   HSCSD                   "ip"
-        * IPv6:
-        *   GPRS/CDMA, pdptype ipv4 "ip",
-        *   GPRS/CDMA, pdptype ipv6 "ip6",
-        *   CSD                     "ip,ip6"
-        *   HSCSD                   "ip,ip6"
-        *
-        */
-        void SetIfNetworksL();
-
-
-        /**
-        * Check if aColumn is supported.
-        * @param aColumn Enum value indicating the column to check.
-        * @return Whether the given member is supported or not
-        */
-        TBool IsSupported( TApMember aColumn );
-
-
-        /**
-        * Leave with KErrNotSupported if aColumn is not supported.
-        * @param aColumn Enum value indicating the column to check.
-        */
-        void LeaveIfUnsupportedL( TApMember aColumn );
-
-
-        /**
-        * Returns whether this item has WLAN or not
-        * @return Whether this item has WLAN or not
-        */
-        TBool IsWlan();
-
-
-        /**
-        * Limit the Ip6 DNS address
-        * In case of CSD, HSCSD, only Well-known and User defined is supported, 
-        * so if the bearer is changed from something else to these bearer
-        * types, the possible 'Dynamic' should be replaced with Well-known
-        */
-        void LimitIp6DNSL();
-
-private:    // Data
-
-        // member data
-        // COMMON
-        TUint32 iWapUid;        ///< The unique identifier of the AP record.
-        HBufC* iWapAccessPointName;
-
-
-        // WAP-spec.
-        HBufC* iWapBearer;
-        HBufC* iStartingPage;
-
-        // common for bearers
-        HBufC* iWapGatewayAddress;  ///< The WAP gateway address
-        TBool iIsWTLSSecurityOn;
-        TUint32 iIsConnectionTypeContinuous;
-
-        CApItemExtra*   iExt;
-        TUint32         iChargeCard;
-        TUint32         iWapIap;
-        TUint32         iWapIspType;    // deprecated, not used but kept 
-                                        // to keep member positions
-
-
-        // IAP-part
-        HBufC* iIapName;
-
-        TUint32 iIapServiceId;
-        HBufC* iIapServiceType;
-
-        TUint32 iIapChargeCardId;
-
-        // ISP-part
-        HBufC* iIspName;
-        HBufC* iIspDescription;
-        TCommsDbIspType  iIspType;
-        HBufC* iIspDefaultTelNumber;
-        TBool iIspDialResolution;
-        TBool iUseLoginScript;
-        HBufC* iLoginScript;
-        TBool iPromptPassword;
-        HBufC* iUserName;
-        HBufC* iPassword;
-        TBool iDisplayTerminalWindow;
-        HBufC* iIspIfName;
-        HBufC* iIspIfParams;
-        HBufC* iIspIfNetworks;
-        TBool iIspIfPromptForAuth;
-        HBufC* iIspIfAuthName;
-        HBufC* iIspIfAuthPass;
-        TUint32 iIspIfAuthRetries;
-        TBool iUseCallBack;
-        TCallbackAction iCallBackTypeIsServerNum;
-        HBufC8* iIspIfCallbackInfo;
-        TUint32 iIspCallbackTimeOut;
-        TBool iIspIPAddrFromServer;
-        HBufC* iIspIPAddr;
-        HBufC* iIspIPNetMask;
-        HBufC* iIspGateway;
-        TBool iGetDNSIPFromServer;
-        HBufC* iPrimaryDNS;
-        HBufC* iSecondaryDNS;
-        TBool iEnablePPPCompression;
-        TBool iIspEnableLCPExtensions;
-        TBool iIsPasswordAuthenticationSecure;
-        TBool iIspEnableSwCompression;
-        /*****************************************************
-        *   Series 60 Customer / ETel
-        *   Series 60   ETel API
-        *****************************************************/
-        TInt    iIspBearerName; // RMobileCall::TMobileCallDataServiceCaps  
-        TApCallSpeed iMaxConnSpeed;
-        TApCallType iBearerCallTypeIsdn; //RMobileCall::TMobileCallDataProtocol
-        TInt    iIspBearerCE; // RMobileCall::TMobileCallDataQoS 
-        HBufC8* iIspInitString;
-        TUint32 iIspBearerType;
-        TUint32 iIspChannelCoding;
-        TUint32 iIspAIUR;
-        TUint32 iIspRequestedTimeSlots;
-        TUint32 iIspMaximumTimeSlots;
-
-        // GPRS part
-        HBufC*  iGprsAccessPointName;
-        TUint32 iGprsPdpType;
-        HBufC*  iGprsPdpAddress;
-        TUint32 iGprsReqPrecedence;
-        TUint32 iGprsReqDelay;
-        TUint32 iGprsReqReliability;
-        TUint32 iGprsReqPeakThroughput;
-        TUint32 iGprsReqMeanPeakThroughput;
-        TUint32 iGprsMinPrecedence;
-
-        TUint32 iGprsMinDelay;
-        TUint32 iGprsMinReliability;
-        TUint32 iGprsMinPeakThroughput;
-        TUint32 iGprsMinMeanThroughput;
-        TBool   iGprsUseAnonymAccess;
-
-        CArrayFixFlat<TBool>    *iSpecified;
-        TBool iIsReadOnly;
-
-        HBufC*  iApProxyProtocolName;
-        HBufC*  iApProxyServerAddress;
-        TUint32 iApProxyPortNumber;
-        TBool   iApProxyUseProxy;
-        HBufC*  iApProxyExceptions;
-        TBool   iApHasProxySettings;
-
-        TUint32 iNetworkId;
-        TUint32 iWapProxyPort;
-        HBufC*  iNetworkName;
-        HBufC*  iWapProxyLoginName;
-        HBufC*  iWapProxyLoginPass;
-        TUint32 iApIapBearerService; // RMobileCall::TMobileCallDataServiceCaps
-
-
-
-    protected:  // Friend classes
-        friend class CApDataHandler;
-
-
-    };
-
-#endif      // ACCESSPOINTITEM_H
-
-// End of File
--- a/ipcm_pub/access_point_engine_api/inc/APDataHandler.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1131 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of class CApDataHandler
-*
-*/
-
-
-#ifndef APDATAHANDLER_H
-#define APDATAHANDLER_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
- 
-//  INCLUDES
-#include <commdb.h>
-#include <etelmm.h>
-#include <ApEngineVer.h>
-#include <ApEngineConsts.h>
-
-
-// FORWARD DECLARATIONS
-class CApAccessPointItem;
-class CApNetworkItem;
-
-// extra data holder.
-typedef struct
-    {
-        TInt    iIsIpv6Supported;            // Is Ipv6 Supported?
-        TBool   iIsFeatureManagerInitialised;// Is FeatureManager Initialised?
-
-        /**
-        * Indicates if HSCSD Access point is supported or not.
-        */
-        TBool   iIsAppHscsdSupport;              
-
-        TInt    iVariant;               /// Local variant value
-
-
-    }THandlerExtra;
-
-// CLASS DECLARATION
-
-/**
-*  Representation of the access point handler.
-*  Encapsulates a session with the CommsDB
-*  Provides a way to access the database and manipulate its data.
-*/
-class CApDataHandler :public CBase
-    {
-    public:  // Constructors and destructor
-        
-        /**
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack.
-        * @param aDb a reference to a CCommsDataBase object.
-        * @return The constructed CApDataHandler.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApDataHandler* NewLC( CCommsDatabase& aDb );
-
-
-        /**
-        * Destructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C virtual ~CApDataHandler();
-
-
-protected:      // Constructors
-
-        /**
-        * C++ default constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C CApDataHandler();
-
-        /**
-        * Second-phase constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL( CCommsDatabase& aDb );
-
-
-    private:
-
-
-    public: // New functions
-        // query
-        /**
-        * Reads up one access point's data from the database.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, function leaves with error code.
-        * <br>Error conditions:
-        *   - Insufficient memory,
-        *   - AP does not exists,
-        *   - Server connection failure.
-        *
-        * @param aUid The Uid of the access point to be read
-        * @param aApItem A reference to a CApAccessPointItem to hold the data.
-        * @return no return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void AccessPointDataL( TUint32 aUid,
-                                      CApAccessPointItem& aApItem );
-
-
-        // update
-        /**
-        * Updates data stored in an existing access point.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, no data is stored.
-        * <br>Error conditions:
-        *   - Insufficient memory
-        *   - Server connection failure
-        *   - Lock already present by other task
-        *   - Uid does not exists.
-        *   - Attempting to update read-only records will result
-        *     in KErrAccessDenied
-        *
-        * @param aApItem A reference to a CApAccessPointItem holding the data
-        * @param aNameChanged a reference to a TBool that will indicate
-        * whether the name has changed or not.
-        * @return No return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void UpdateAccessPointDataL( CApAccessPointItem& aApItem,
-                                              TBool& aNameChanged );
-
-
-        // Creating new AP
-        /**
-        * Creates a copy of a previously existing access point.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, no access point will be created.
-        * <br>Error conditions:
-        *   - Insufficient memory
-        *   - Server connection failure.
-        *   - Lock already present by other task.
-        *   - Access point does not exist.
-        *   - Attempting to create new in protected tables will results
-        *     in KErrAccessDenied
-        *
-        * @param aBaseId The UID of the existing access point to copy from.
-        * @return The Uid of the newly constructed and saved access point.
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 CreateCopyFromL( TUint32 aBaseId );
-
-
-        /**
-        * Create a new access point from supplied data
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * The name of the AP will be corrected to be unique if necessary and
-        * returned in the passed aApItem.
-        * In case of error, no access point will be created and the passed
-        * one will remain intact.
-        * <br>Error conditions:
-        *   - Insufficient memory
-        *   - Server connection failure.
-        *   - Lock already present by other task.
-        *   - Attempting to create new in protected tables will result
-        * in KErrAccessDenied
-        *
-        * @param aApItem Reference to a CApAccessPointItem holding the data
-        * @return The UID of the newly created and saved access point.
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 CreateFromDataL( CApAccessPointItem& aApItem );
-
-
-        // Remove
-        /**
-        * Removes the given access point from the database.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, access point will not be removed.
-        * <br>Error conditions:
-        *   - Insufficient memory,
-        *   - Server connection failure.
-        *   - Lock already present by other task.
-        *   - Access point does not exist.
-        *   - Attempting to remove read-only records will result
-        * in KErrAccessDenied
-        *
-        * @param aUid The UID of the access point to remove.
-        * @return no return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void RemoveAPL( TUint32 aUid );
-
-
-        // Getting default access point
-        /**
-        * Reads the UID of the default access point.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, leaves with CommsDb or system error codes.
-        * <br>Error conditions:
-        *   - Insufficient memory;
-        *   - Server connection failure;
-        *   - Lock already present;
-        *   - Access point does not exists.
-        *
-        * @param aIsWAP A boolean indicating whether to read the default
-        * WAP or the default IAP/ISP (dep. on the database type) access point.
-        * @return The UID of the default access point.
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 DefaultL( TBool aIsWap ) const;
-
-
-        // Setting as default
-        /**
-        * Sets the default access point.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, leaves with CommsDb or system error codes.
-        * <br>Error conditions:
-        *   - Insufficient memory;
-        *   - Server connection failure;
-        *   - Lock already present;
-        *   - Access point does not exists.
-        *   - Given Access Point is not of the desired type.
-        *
-        * @param aUid The UID of the access point to be set as default.
-        * @param aIntendedType The default type ( IAP, WAP, Both).
-        *
-        * @deprecated
-        */
-        IMPORT_C void SetAsDefaultL(TUint32 aUid,
-                                    TCommsDbIspType aIntendedType );
-
-
-
-        // Setting preferences
-        /**
-        * Sets the access point preference. Can be used only if the
-        * database type is IAP.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, leaves with CommsDb or system error codes.
-        * <br>Error conditions:
-        *   - Insufficient memory;
-        *   - Server connection failure;
-        *   - Lock already present;
-        * Can also leave with KErrAlreadyExists (if aOverWrite is EFalse ).
-        * @param aRank The ranking of the connection preference.
-        * @param aDircetion Specifies the direction of this connection
-        * preference
-        * @param aBearers The bearer set being valid for this connection
-        * preference
-        * @param aPrompt Enum value indicating whether or not the user
-        * should be prompted or warned on connection
-        * @param aIAP The identifier of the preferred IAP for this connection.
-        * @param aOverwrite Boolean value indicating that if a same record
-        * present, overwrite it or not.
-        *
-        * @deprecated
-        */
-        IMPORT_C void SetPreferredIfDbIapTypeL
-                                    (
-                                    TUint32 aRank,
-                                    TCommDbConnectionDirection aDirection,
-                                    TUint32 aBearers,
-                                    TCommDbDialogPref aPrompt,
-                                    TUint32 aIAP,
-                                    TBool aOverwrite
-                                    );
-
-        /**
-        * Sets the access point preference. Can be used only if the
-        * database type is ISP.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, leaves with CommsDb or system error codes.
-        * <br>Error conditions:
-        *   - Insufficient memory;
-        *   - Server connection failure;
-        *   - Lock already present;
-        * Can also leave with KErrAlreadyExists (if aOverWrite is EFalse ).
-        * @param aRank The ranking of the connection preference.
-        * @param aDircetion Specifies the direction of this connection
-        * preference
-        * @param aBearers The bearer set beeing valid for this connection
-        * preference
-        * @param aPrompt Enum value indicating whether or not the user
-        * should be prompted or warned on connection
-        * @param aISP The identifier of the preferred ISP for this connection.
-        * @param aChargeCard Identifier of the preferred chargecard for
-        * this connection.
-        * @param aServiceType The type of the service.
-        * @param aOverwrite Boolean value indicating that if a same record is
-        * present, overwrite it or not.
-        *
-        * @deprecated
-        */
-        IMPORT_C void SetPreferredIfDbIspTypeL
-                                    (
-                                    TUint32 aRank,
-                                    TCommDbConnectionDirection aDirection,
-                                    TUint32 aBearers,
-                                    TCommDbDialogPref aPrompt,
-                                    TUint32 aISP,
-                                    TUint32 aChargeCard,
-                                    const TDesC& aServiceType,
-                                    TBool aOverwrite
-                                    );
-
-
-
-        /**
-        * Gets the access point preference. Can be used only if the
-        * database type is IAP.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, leaves with CommsDb or system error codes.
-        * <br>Error conditions:
-        *   - Insufficient memory;
-        *   - Server connection failure;
-        *   - Lock already present;
-        * @param aRank The ranking of the desired connection preference.
-        * @param aDircetion Specifies the direction of the desired connection
-        * preference
-        * @param aBearers The bearer set beeing valid for this connection
-        * preference
-        * @param aPrompt Enum value indicating whether or not the user
-        * should be prompted or warned on connection
-        * @param aIAP The identifier of the preferred IAP for this
-        * connection preference.
-        *
-        * @deprecated
-        */
-        IMPORT_C void GetPreferredIfDbIapTypeL
-                                    (
-                                    TUint32 aRank,
-                                    TCommDbConnectionDirection aDirection,
-                                    TUint32& aBearers,
-                                    TUint32& aPrompt,
-                                    TUint32& aIAP
-                                    );
-
-        /**
-        * Gets the access point preference. Can be used only if the
-        * database type is ISP.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, leaves with CommsDb or system error codes.
-        * <br>Error conditions:
-        *   - Insufficient memory;
-        *   - Server connection failure;
-        *   - Lock already present;
-        * @param aRank The ranking of the desired connection preference.
-        * @param aDircetion Specifies the direction of the desired connection
-        * preference
-        * @param aBearers The bearer set beeing valid for this connection
-        * preference
-        * @param aPrompt Enum value indicating whether or not the user
-        * should be prompted or warned on connection
-        * @param aISP The identifier of the preferred ISP for this
-        * connection preference.
-        * @param aChargeCard Identifier of the preferred chargecard for
-        * this connection preference.
-        * @return The type of the service.
-        *
-        * @deprecated
-        */
-        IMPORT_C const TDesC& GetPreferredIfDbIspTypeL
-                                    (
-                                    TUint32 aRank,
-                                    TCommDbConnectionDirection aDirection,
-                                    TUint32& aBearers,
-                                    TUint32& aPrompt,
-                                    TUint32& aISP,
-                                    TUint32& aChargeCard
-                                    );
-
-
-        // Getting default access point
-        /**
-        * Reads the UID of the default access point.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, leaves with CommsDb or system error codes.
-        * <br>Error conditions:
-        *   - Insufficient memory;
-        *   - Server connection failure;
-        *   - Lock already present;
-        *   - Access point does not exists.
-        *
-        * @param aIsWAP A boolean indicating whether to read the default
-        * WAP or the default IAP/ISP (dep. on the database type) access point.
-        * @param aReadOnly A TBool passed by reference to hold whether the
-        * the default access point record is read-only or not.
-        * @return The UID of the default access point.
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 DefaultL( TBool aIsWap, TBool& aReadOnly )const;
-
-
-
-
-        // Remove
-        /**
-        * Removes the given network group from the database.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, network group will not be removed.
-        * <br>Error conditions:
-        *   - Insufficient memory,
-        *   - Server connection failure.
-        *   - Lock already present by other task.
-        *   - network group does not exist.
-        *   - Attempting to remove read-only records will result
-        * in KErrAccessDenied
-        *
-        * @param aUid The UID of the network group to remove.
-        * @return no return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void RemoveNetworkL( TUint32 aUid );
-
-
-        /**
-        * Creates a network group from the data.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, network group will not be created.
-        * <br>Error conditions:
-        *   - Insufficient memory,
-        *   - Server connection failure.
-        *   - Lock already present by other task.
-        *   - network group does not exist.
-        *   - Attempting to remove read-only records will result
-        * in KErrAccessDenied
-        *
-        * @param aNetwork The network item to create/write into db.
-        * @return no return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void CreateNetworkL( CApNetworkItem& aNetwork );
-
-
-        /**
-        * Reads up a network part of the access point
-        * Network is identified by the iNetworkId of the passed access point
-        *
-        * @deprecated
-        */
-        IMPORT_C void ReadNetworkPartL( CApAccessPointItem& aItem );
-
-
-
-        /**
-        * Reads up a network 
-        * Network is identified by passed uid
-        *
-        * @deprecated
-        */
-        IMPORT_C void ReadNetworkL( TUint32 aUid, CApNetworkItem& aNetwork );
-
-
-    protected:  // New functions
-        /**
-        * Reads the WAP part of the data from the database.
-        * In case of error, leaves with CommDb error codes.
-        * @param aWapId The UID of the Access Point to read the data from.
-        * @param aApItem A reference to a CApAccessPointItem to hold the data
-        * @return No return value.
-        */
-        void ReadWapDataL( TUint32 aWapId, CApAccessPointItem& aApItem );
-
-
-        /**
-        * Reads the IAP part of the data from the database.
-        * In case of error, leaves with CommDb error codes.
-        * @param aIapId The UID of the record in the IAP table to read
-        * the data.
-        * @param aApItem A reference to a CApAccessPointItem to hold the data
-        * @return No return value.
-        */
-        void ReadIapDataL( TUint32 aIapId, CApAccessPointItem& aApItem );
-
-
-        /**
-        * Reads the ISP part of the data from the database.
-        * In case of error, leaves with CommDb error codes.
-        * @param aIspId The UID of the record in the ISP table to
-        * read the data.
-        * @param aApItem A reference to a CApAccessPointItem to hold the data
-        * @return No return value.
-        */
-        void ReadIspDataL( TUint32 aIspId, CApAccessPointItem& aApItem );
-
-
-        /**
-        * Reads the GPRS data from the database.
-        * In case of error, leaves with CommDb error codes.
-        * @param aIspId The UID of the record in the GPRS table to
-        * read the data from.
-        * @param aApItem A reference to a CApAccessPointItem to hold the data
-        * @return No return value.
-        */
-        void ReadGprsDataL( TUint32 aIspId, CApAccessPointItem& aApItem );
-
-
-        /**
-        * Reads the LAN data from the database.
-        * In case of error, leaves with CommDb error codes.
-        * @param aIspId The UID of the record in the LAN table to
-        * read the data from.
-        * @param aApItem A reference to a CApAccessPointItem to hold the data
-        * @return No return value.
-        */
-        void ReadLanDataL( TUint32 aIspId, CApAccessPointItem& aApItem );
-
-
-        /**
-        * Reads the DialIn/Out ISP data from the database.
-        * In case of error, leaves with CommDb error codes.
-        * @param aIspId The UID of the record in the Dialup table to
-        * read the data from.
-        * @param aApItem A reference to a CApAccessPointItem to hold the data
-        * @return No return value.
-        */
-        void ReadDialInOutDataL( TUint32 aIspId, CApAccessPointItem& aApItem );
-
-        
-        /**
-        * Reads up the VPN bearer type info in case of a VPN access point
-        * In case of error, leaves with CommDb error codes.
-        * @param aIspId The UID of the record in the VPN table to
-        * read the data from.
-        * @param aApItem A reference to a CApAccessPointItem to hold the data
-        * @return No return value.
-        */
-        void ReadVpnInfoL( TUint32 aIspId, CApAccessPointItem& aApItem);
-
-
-        /**
-        * Writes the WAP bearer part of the data to the database.
-        * In case of error, leaves with CommDb error codes.
-        * @param aIsNew A Boolean indicating whether it is a new record or it
-        * is an update operation.
-        * @param aWapId The UID of the WAP Access Point record to update.
-        * Used only if aIsNew EFalse.
-        * @param aApItem Reference to a CApAccessPointItem which holds the data
-        * @return No return value.
-        */
-        void WriteWapBearerDataL
-                        (
-                        TBool aIsNew,
-                        TUint32 aWapId,
-                        CApAccessPointItem& aApItem
-                        );
-
-
-        /**
-        * Writes the WAP AP part of the data to the database.
-        * In case of error, leaves with CommDb error codes.
-        * @param aIsNew A Boolean indicating whether it is a new record or it
-        * is an update operation.
-        * @param aWapId The UID of the WAP Access Point record to update.
-        * Used only if aIsNew EFalse.
-        * @param aApItem Reference to a CApAccessPointItem which holds the data
-        * @return No return value.
-        */
-        void WriteWapApDataL
-                        (
-                        TBool aIsNew,
-                        TUint32 aWapId,
-                        CApAccessPointItem& aApItem
-                        );
-
-
-
-        /**
-        * Writes the IAP part of the data to the database.
-        * In case of error, leaves with CommDb error codes.
-        * @param aIsNew A Boolean indicating whether it is a new record or it
-        * is an update operation.
-        * @param aIapId The UID of the IAP Access Point record to update.
-        * Used only if aIsNew EFalse.
-        * @param aApItem Reference to a CApAccessPointItem which holds the data
-        * @return No return value.
-        */
-        void WriteIapDataL
-                        (
-                        TBool aIsNew,
-                        TUint32 aIapId,
-                        CApAccessPointItem& aApItem
-                        );
-
-        /**
-        * Writes the ISP part of the data to the database.
-        * In case of error, leaves with CommDb error codes.
-        * @param aIsNew A Boolean indicating whether it is a new record or it
-        * is an update operation.
-        * @param aIspId The UID of the ISP Access Point record to update.
-        * Used only if aIsNew EFalse.
-        * @param aApItem Reference to a CApAccessPointItem which holds the data
-        * @return No return value.
-        */
-        void WriteIspDataL( TBool aIsNew, TUint32 aIspId,
-                            CApAccessPointItem& aApItem );
-
-        /**
-        * Writes the Gprs data to the database.
-        * In case of error, leaves with CommDb error codes.
-        * @param aIsNew A Boolean indicating whether it is a new record or it
-        * is an update operation.
-        * @param aApItem Reference to a CApAccessPointItem which holds the data
-        * @return No return value.
-        */
-        void WriteGprsDataL( TBool aIsNew,
-                            CApAccessPointItem& aApItem );
-
-        /**
-        * Writes the LAN data to the database.
-        * In case of error, leaves with CommDb error codes.
-        * @param aIsNew A Boolean indicating whether it is a new record or it
-        * is an update operation.
-        * @param aApItem Reference to a CApAccessPointItem which holds the data
-        * @return No return value.
-        */
-        void WriteLanDataL( TBool aIsNew,
-                            CApAccessPointItem& aApItem );
-
-
-        /**
-        * Writes the data to the database.
-        * In case of error, leaves with CommDb error codes.
-        * @param aApItem Reference to a CApAccessPointItem which holds the data
-        * @param aIsNew A Boolean indicating whether it is a new record or it
-        * is an update operation.
-        * @return No return value.
-        */
-        TUint32 DoUpdateAccessPointDataL( CApAccessPointItem& aApItem,
-                                       TBool aIsNew, TBool& aNameChanged );
-
-
-        /**
-        * Sets the default IAP & ISP records in Global Settings.
-        * In case of error, leaves with CommDb error codes.
-        * @param aApItem A UID to the WAP Access Point record to
-        * be used as a default.
-        * @return No return value.
-        */
-        void SetDefaultIapIspL( TUint32 aUid );
-
-        // Remove
-        /**
-        * Removes the WAP_BEARER table part of the access point from
-        * the database.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, access point will not be removed.
-        * @param aUid The UID of the access point to remove.
-        * @return No return value.
-        */
-        void RemoveWapBearerApL( TUint32 aUid );
-
-
-        /**
-        * Removes the WAP_ACCESS_POINT table part of the access point from
-        * the database.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, access point will not be removed.
-        * @param aUid The UID of the access point to remove.
-        * @return No return value.
-        */
-        void RemoveWapApL( TUint32 aUid );
-
-
-        /**
-        * Removes the IAP part of the access point from the database.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, access point will not be removed.
-        * @param aUid The UID of the IAP part of the access point to remove.
-        * @return No return value.
-        */
-        void RemoveIapL( TUint32 aUid );
-
-
-        /**
-        * Removes the ISP part of the access point from the database.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, access point will not be removed.
-        * @param aUid The UID of the ISP part of the access point to remove.
-        * @param aOut TBool indicating whether Dial out or dial in ISP.
-        * @return No return value.
-        */
-        void RemoveIspL( TUint32 aUid, TBool aOut );
-
-
-        /**
-        * Removes the GPRS part of the access point from the database.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, access point will not be removed.
-        * @param aUid The UID of the GPRS part of the access point to remove.
-        * @return No return value.
-        */
-        void RemoveGprsL( TUint32 aUid, TBool aOut );
-
-
-        /**
-        * Removes the LAN part of the access point from the database.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, access point will not be removed.
-        * @param aUid The UID of the LAN part of the access point to remove.
-        * @return No return value.
-        */
-        void RemoveLanL( TUint32 aUid );
-
-
-        /**
-        * Removes the WLAN part of the access point from the database.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, access point will not be removed.
-        * @param aUid The UID of the LAN part of the access point to remove.
-        * @return No return value.
-        */
-        void RemoveWlanL( TUint32 aUid );
-        
-        
-        /**
-        * Handles the bearer change related things (deleting old links,
-        * inserting new ones if needed in the database).
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, access point data will not be changed.
-        * @param aApItem A reference to a CApAccessPointItem holding the
-        * CHANGED data.
-        * @return Boolean indicating whether bearer has changed or not.
-        */
-        TBool HandleBearerChangeIfNeededL( CApAccessPointItem& aApItem );
-
-
-
-        /**
-        * Reads up one access point's data from the database.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, function leaves with error code.
-        * <br>Error conditions:
-        *   - Insufficient memory,
-        *   - AP does not exists,
-        *   - Server connection failure.
-        *
-        * @param aUid The Uid of the access point to be read
-        * @param aApItem A reference to a CApAccessPointItem to hold the data.
-        * @return no return value.
-        */
-        void DoAccessPointDataL( TUint32 aUid, CApAccessPointItem& aApItem );
-
-
-        /**
-        * Removes the given access point from the database.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, access point will not be removed.
-        * <br>Error conditions:
-        *   - Insufficient memory,
-        *   - Server connection failure.
-        *   - Lock already present by other task.
-        *   - Access point does not exist.
-        *   - Attempting to remove read-only records will result
-        * in KErrAccessDenied
-        *
-        * @param aUid The UID of the access point to remove.
-        * @return no return value.
-        */
-        void DoRemoveAPL( TUint32 aUid );
-
-
-        /**
-        * Sets the default access point.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, leaves with CommsDb or system error codes.
-        * <br>Error conditions:
-        *   - Insufficient memory;
-        *   - Server connection failure;
-        *   - Lock already present;
-        *   - Access point does not exists.
-        *   - Given Access Point is not of the desired type.
-        *
-        * @param aUid The UID of the access point to be set as default.
-        * @param aIntendedType The default type ( IAP, WAP, Both).
-        */
-        void DoSetAsDefaultL(TUint32 aUid, TCommsDbIspType aIntendedType );
-
-
-        /**
-        * Sets the access point preference. Can be used only if the
-        * database type is IAP.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, leaves with CommsDb or system error codes.
-        * <br>Error conditions:
-        *   - Insufficient memory;
-        *   - Server connection failure;
-        *   - Lock already present;
-        * Can also leave with KErrAlreadyExists (if aOverWrite is EFalse ).
-        * @param aRank The ranking of the connection preference.
-        * @param aDircetion Specifies the direction of this connection
-        * preference
-        * @param aBearers The bearer set beeing valid for this connection
-        * preference
-        * @param aPrompt Enum value indicating whether or not the user
-        * should be prompted or warned on connection
-        * @param aIAP The identifier of the preferred IAP for this connection.
-        * @param aOverwrite Boolean value indicating that if a same record
-        * present, overwrite it or not.
-        */
-        void DoSetPreferredIfDbIapTypeL
-                                    (
-                                    TUint32 aRank,
-                                    TCommDbConnectionDirection aDirection,
-                                    TUint32 aBearers,
-                                    TCommDbDialogPref aPrompt,
-                                    TUint32 aIAP,
-                                    TBool aOverwrite
-                                    );
-
-
-        /**
-        * Sets the access point preference. Can be used only if the
-        * database type is ISP.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, leaves with CommsDb or system error codes.
-        * <br>Error conditions:
-        *   - Insufficient memory;
-        *   - Server connection failure;
-        *   - Lock already present;
-        * Can also leave with KErrAlreadyExists (if aOverWrite is EFalse ).
-        * @param aRank The ranking of the connection preference.
-        * @param aDircetion Specifies the direction of this connection
-        * preference
-        * @param aBearers The bearer set beeing valid for this connection
-        * preference
-        * @param aPrompt Enum value indicating whether or not the user
-        * should be prompted or warned on connection
-        * @param aISP The identifier of the preferred ISP for this connection.
-        * @param aChargeCard Identifier of the preferred chargecard for
-        * this connection.
-        * @param aServiceType The type of the service.
-        * @param aOverwrite Boolean value indicating that if a same record
-        * present, overwrite it or not.
-        */
-        void DoSetPreferredIfDbIspTypeL
-                                    (
-                                    TUint32 aRank,
-                                    TCommDbConnectionDirection aDirection,
-                                    TUint32 aBearers,
-                                    TCommDbDialogPref aPrompt,
-                                    TUint32 aISP,
-                                    TUint32 aChargeCard,
-                                    const TDesC& aServiceType,
-                                    TBool aOverwrite
-                                    );
-
-
-        /**
-        * Converts setted AP speed from TApCallSpeed to commsdb values
-        * @param The access point item whose speed needs to be converted
-        * @return no return value
-        */
-        /*****************************************************
-        *   Series 60 Customer / ETel
-        *   Series 60  ETel API
-        *****************************************************/
-        void ApSpeed2EtelL( CApAccessPointItem* aItem );
-
-
-        /**
-        * Converts commsdb speed values to TApCallSpeed 
-        * @param The access point item whose speed needs to be converted
-        * @return no return value
-        */
-        /*****************************************************
-        *   Series 60 Customer / ETel
-        *   Series 60  ETel API
-        *****************************************************/
-        void EtelSpeed2ApL(  CApAccessPointItem& aItem );
-
-
-        // Getting default access point
-        /**
-        * Reads the UID of the default access point.
-        * Expects that CApDataHandler has been created and the database had
-        * been opened.
-        * In case of error, leaves with CommsDb or system error codes.
-        * <br>Error conditions:
-        *   - Insufficient memory;
-        *   - Server connection failure;
-        *   - Lock already present;
-        *   - Access point does not exists.
-        *
-        * @param aIsWAP A boolean indicating whether to read the default
-        * WAP or the default IAP/ISP (dep. on the database type) access point.
-        * @param TBool*: if not NULL, a holder for the read-only flag of
-        * the default access point. Prepared for future products but also used
-        * here through passing NULL ptr.
-        * @return The UID of the default access point.
-        */
-        TUint32 DoGetDefaultL( TBool aIsWap, TBool* aReadOnly ) const;
-
-
-        /**
-        * Writes the proxy data of an access point
-        * @param aIsNew Boolean stating whether the access point is new
-        * @param aApItem A CApAccessPointItem passed by reference 
-        * holding the current access point data. It's record ID's will be 
-        * updated if needed (in case it is a new item )
-        */
-        void WriteProxyDataL( TBool aIsNew, 
-                              const CApAccessPointItem& aApItem );
-
-
-        /**
-        * Reads up the proxy data of an access point
-        * @param aApItem A CApAccessPointItem passed by reference 
-        * holding the current access point data. 
-        */
-        void ReadProxyDataL( CApAccessPointItem& aApItem );
-
-
-        /**
-        * Removes a proxy data
-        * @param aServiceType   The service type to remove for
-        * @param aIspId         The service record ID
-        */
-        void RemoveProxyDataL( HBufC* aServiceType, TUint32 aIspId );
-
-
-        /**
-        * Writes the network data of an access point
-        * @param aIsNew Boolean stating whether the access point is new
-        * @param aApItem A CApAccessPointItem passed by reference 
-        * holding the current access point data. It's record ID's will be 
-        * updated if needed (in case it is a new item )
-        */
-        void WriteNetworkDataL( TBool aIsNew, CApAccessPointItem& aApItem );
-
-
-        /**
-        * Reads up the network data of an access point
-        * @param aApItem A CApAccessPointItem passed by reference 
-        * holding the current access point data. 
-        */
-        void ReadNetworkDataL( CApAccessPointItem& aApItem );
-
-
-        /**
-        * Removes the network data
-        * @param aIspId The record ID to remove
-        */
-        void RemoveNetworkDataL( TUint32 aIspId );
-
-
-        /**
-        * Gets the location record ID
-        * @return The UID of the location.
-        */
-        TUint32 GetLocationIdL();
-
-
-        /**
-        * Gets the modem record ID
-        * @return The UID of the modem record.
-        */
-        TUint32 GetModemBearerIDL( CApAccessPointItem& aApItem );
-
-
-        /**
-        * Returns the protocol for the passed item
-        * @param aApItem An access point item 
-        * @return The protocol of the passed item.
-        */
-        TUint32 ProtocolL( CApAccessPointItem& aApItem );
-
-        /**
-        * Returns the commsdb speed for the passed item
-        * @param aApItem An access point item 
-        * @return The speed of the passed item.
-        */
-        TUint32 CommsDbSpeedL( CApAccessPointItem& aApItem );
-
-
-        /**
-        * Reads up common IP & PPP SERVICE data parts of an access point.
-        * Leaves if it is not persent in the database
-        * @param The table to read from
-        * @param The CApAccessPointItem to store into
-        */
-        void ReadServiceL( CCommsDbTableView& ispt, 
-                           CApAccessPointItem& aApItem );
-
-
-        /**
-        * Reads up CSD/GPRS IPv6 parts of an access point.
-        * Leaves if it is not persent in the database
-        * @param The table to read from
-        * @param The CApAccessPointItem to store into
-        */
-        void ReadServiceIp6L( CCommsDbTableView& ispt,
-                              CApAccessPointItem& aApItem );
-
-
-        /**
-        * Writes common IP & PPP SERVICE data parts of an access point.
-        * Leaves if it is not persent in the database
-        * @param The table to write into 
-        * @param The CApAccessPointItem holding the data to store 
-        */
-        void WriteServiceL( CCommsDbTableView& aTable,
-                            CApAccessPointItem& aApItem );
-
-
-        /**
-        * Writes the IPv6 parts of an access point.
-        * Leaves if it is not persent in the database
-        * @param The table to write to 
-        * @param The CApAccessPointItem to read the data from
-        */
-        void WriteServiceIp6L( CCommsDbTableView& ispt,
-                               CApAccessPointItem& aApItem );
-
-
-        /**
-        * Writes the CSD isp data to the database.
-        * In case of error, leaves with CommDb error codes.
-        * Leaves with KErrNotSupported if (HS)CSD bearer type is not supported.
-        * @param aIsNew A Boolean indicating whether it is a new record or it
-        * is an update operation.
-        * @param aApItem Reference to a CApAccessPointItem which holds the data
-        * @return No return value.
-        */
-        void WriteCsdDataL( TBool aIsNew, CApAccessPointItem& aApItem );
-
-
-        /**
-        * Gets the local variant value 
-        * @return A TInt stating the variant
-        */
-//        TInt GetVariantL();
-
-
-        /**
-        * Reads up WLAN data parts of an access point.
-        * Leaves if it is not persent in the database
-        * @param The table to read from
-        * @param The CApAccessPointItem to store into
-        */
-        void ReadWlanL( CCommsDbTableView& lant,
-                        CApAccessPointItem& aApItem );
-
-
-        /**
-        * Writes the WLAN parts of an access point.
-        * Leaves if it is not persent in the database
-        * @param The table to write to 
-        * @param The CApAccessPointItem to read the data from
-        */
-        void WriteWlanL( CCommsDbTableView& aTable,
-                         CApAccessPointItem& aApItem );
-
-        /**
-        * Creates a new record in the LANBearer table if there is none for WLAN
-        * @return The UID of the LANBEarer record.
-        */
-        TUint32 CreateLanBearerIfNeededL();
-
-
-
-        /**
-        * Reads up the name of the LAN/Modem bearer record
-        */
-        void ReadModemBearerNameL( CApAccessPointItem& aApItem );
-        
-
-    private:    // Data
-        CCommsDatabase* iDb;
-//        TCommDbDatabaseType iDbType;  // deprecated and not used but kept 
-                                        // to maintain class size for BC
-        // no change in size as deprecated removed, 
-        // new added, with the same size...
-        THandlerExtra*  iExt;
-
-
-    };
-
-#endif      // APDATAHANDLER_H
-
-// End of File
--- a/ipcm_pub/access_point_engine_api/inc/APNetworks.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,139 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the CApNetworks class.
-*
-*/
-
-
-#ifndef CAPNETWORKS_H
-#define CAPNETWORKS_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
- 
-//  INCLUDES
-#include <commdb.h>
-#include <ApEngineVer.h>
-#include <ApEngineConsts.h>
-
-// FORWARD DECLARATIONS
-class CApNetworkItem;
-class CApNetworkItemList;
-
-// CLASS DECLARATION
-
-/**
-*  This class is used to help client's network selection.
-*
-*/
-NONSHARABLE_CLASS( CApNetworks ) :public CBase
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack.
-        * @param aDb a reference to a CCommsDataBase.
-        * @return The constructed CApNetworks.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApNetworks* NewLC( CCommsDatabase& aDb );
-
-
-        /**
-        * Destructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C virtual ~CApNetworks();
-
-
-    private:      // Constructors
-
-        /**
-        * C++ default constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C CApNetworks();
-
-        /**
-        * Second-phase constructor.
-        * @param aDb The database
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL( CCommsDatabase& aDb );
-
-
-
-    public: // New functions
-
-        /**
-        * Counts the items in the list
-        * @return The number of items in the list.
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 Count() const;
-
-
-        /**
-        * Gets the name of the network group with the given UID
-        * Ownership of the returned text is not passed.
-        * @param aUid The uid of the network item 
-        * @return The name of the network group
-        *
-        * @deprecated
-        */
-        IMPORT_C const TDesC& NameL( TUint32 aUid ) const;
-
-
-
-        /**
-        * Provides all data in a CApNetworkItemList array.
-        * @param aList A reference to a CApNetworkItemList object
-        * to hold the values.
-        * @return The number of items in the list.
-        * All elements in the aList array and their memory
-        * will be freed inside the routine.
-        * The routine expands or shrinks the array as necessary
-        * to minimize memory consumption.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt AllListItemDataL( CApNetworkItemList& aList );
-
-
-    private:
-        /**
-        * This function updates the member data according to the
-        * current filter settings.
-        * @return Error code.
-        */
-        TInt DoUpdateL();
-
-
-
-    private:    // Data
-        CCommsDatabase*             iDb;    // Does not own it!
-        CApNetworkItemList*         iApList;
-        TInt                        iCount;
-    };
-
-#endif      // CAPNETWORKS_H
-
-// End of File
--- a/ipcm_pub/access_point_engine_api/inc/APSelect.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,738 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the CApSelect class.
-*
-*/
-
-
-#ifndef CAPSELECT_H
-#define CAPSELECT_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
- 
-//  INCLUDES
-#include <commdb.h>
-#include <ApEngineVer.h>
-#include <ApEngineConsts.h>
-
-
-// FORWARD DECLARATIONS
-class CApListItem;
-class CApListItemList;
-class CApUtils;
-
-
-
-enum TVpnFilterType
-    {
-    EVpnFilterVpnOnly,          ///< Shows only VPN access points
-    EVpnFilterNoVpn,            ///< Shows only non-VPN access points
-    EVpnFilterBoth              ///< Shows both normal and VPN access points
-    };
-
-
-// CLASS DECLARATION
-// Extra data holder
-typedef struct
-    {
-        TInt                iMaxIndex;
-        TInt                iReqIpvType;
-        TInt                iIsIpv6Supported;
-        TInt                iExtra;
-        TBool               iIsFeatureManagerInitialised;
-        TBool               iCdma;
-        TInt                iVpnFilterType; // TVpnFilterType values !!
-        TBool               iWlanSupported;
-        TBool               iIncludeEasyWlan;
-    }TSelectExtra;
-
-
-
-typedef struct
-    {
-    TUint32     iVpnIapId;
-    TUint32     iHomeIapId;
-    TUint32     iHomeSnapId;
-    HBufC *     iName;
-    }TVpnData;
-
-
-/**
-*  This class is used to help client's access point selection.
-*  Selection can be tailored with specific filters, rules and sort order.
-*  Provides methods for setting and getting filters and sort order.
-*
-*/
-class CApSelect :public CBase
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack.
-        * @param aDb a pointer to a CCommsDataBase.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * Possible values are:
-        * KEApIspTypeInternetOnly, KEApIspTypeWAPOnly,
-        * KEApIspTypeInternetAndWAP, KEApIspTypeWAPMandatory
-        * KEApIspTypeAll and their combinations.
-        * @param aBearerFilter Filtering criteria on bearer type
-        * Possible values are the TApBearer enums and
-        * their combinations (or-ed).
-        * @param aSortType Specifies the sort order to use.
-        * Possible values are:
-        * KEApSortUidAscending, KEApSortUidDescending,
-        * KEApSortNameAscending, KEApSortNameDescending
-        * @return The constructed CApSelect.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApSelect* NewLC(
-                                        CCommsDatabase& aDb,
-                                        TInt aIspFilter,
-                                        TInt aBearerFilter,
-                                        TInt aSortType
-                                        );
-
-
-        /**
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack.
-        * @param aDb a pointer to a CCommsDataBase.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * Possible values are:
-        * KEApIspTypeInternetOnly, KEApIspTypeWAPOnly,
-        * KEApIspTypeInternetAndWAP, KEApIspTypeWAPMandatory
-        * KEApIspTypeAll and their combinations.
-        * @param aBearerFilter Filtering criteria on bearer type
-        * Possible values are the TApBearer enums and
-        * their combinations (or-ed).
-        * @param aSortType Specifies the sort order to use.
-        * Possible values are:
-        * KEApSortUidAscending, KEApSortUidDescending,
-        * KEApSortNameAscending, KEApSortNameDescending
-        * @param aReqIpvType Filtering criteria on the IPv type of the 
-        * access point. In case of GPRS, GPRS_PDP_TYPE holds it, while
-        * in case of CSD, all CSD access points are 
-        * considered to be IPv4 & IPv6 (both)
-        * @return The constructed CApSelect.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApSelect* NewLC(
-                                        CCommsDatabase& aDb,
-                                        TInt aIspFilter,
-                                        TInt aBearerFilter,
-                                        TInt aSortType,
-                                        TInt aReqIpvType
-                                        );
-
-
-
-        /**
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack.
-        * @param aDb a pointer to a CCommsDataBase.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * Possible values are:
-        * KEApIspTypeInternetOnly, KEApIspTypeWAPOnly,
-        * KEApIspTypeInternetAndWAP, KEApIspTypeWAPMandatory
-        * KEApIspTypeAll and their combinations.
-        * @param aBearerFilter Filtering criteria on bearer type
-        * Possible values are the TApBearer enums and
-        * their combinations (or-ed).
-        * @param aSortType Specifies the sort order to use.
-        * Possible values are:
-        * KEApSortUidAscending, KEApSortUidDescending,
-        * KEApSortNameAscending, KEApSortNameDescending
-        * @param aReqIpvType Filtering criteria on the IPv type of the 
-        * access point. In case of GPRS, GPRS_PDP_TYPE holds it, while
-        * in case of CSD, all CSD access points are 
-        * considered to be IPv4 & IPv6 (both)
-        * @param aVpnFilterType a TVpnFilterType enum specifying the 
-        * vpn filtering.
-        * @return The constructed CApSelect.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApSelect* NewLC(
-                                        CCommsDatabase& aDb,
-                                        TInt aIspFilter,
-                                        TInt aBearerFilter,
-                                        TInt aSortType,
-                                        TInt aReqIpvType,
-                                        TVpnFilterType aVpnFilterType );
-
-
-        /**
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack.
-        * @param aDb a pointer to a CCommsDataBase.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * Possible values are:
-        * KEApIspTypeInternetOnly, KEApIspTypeWAPOnly,
-        * KEApIspTypeInternetAndWAP, KEApIspTypeWAPMandatory
-        * KEApIspTypeAll and their combinations.
-        * @param aBearerFilter Filtering criteria on bearer type
-        * Possible values are the TApBearer enums and
-        * their combinations (or-ed).
-        * @param aSortType Specifies the sort order to use.
-        * Possible values are:
-        * KEApSortUidAscending, KEApSortUidDescending,
-        * KEApSortNameAscending, KEApSortNameDescending
-        * @param aReqIpvType Filtering criteria on the IPv type of the 
-        * access point. In case of GPRS, GPRS_PDP_TYPE holds it, while
-        * in case of CSD, all CSD access points are 
-        * considered to be IPv4 & IPv6 (both)
-        * @param aVpnFilterType a TVpnFilterType enum specifying the 
-        * vpn filtering.
-        * @param aIncludeEasyWlan TBool specifying whther to include
-        * EasyWlan access point in the list or not...
-        * @return The constructed CApSelect.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApSelect* NewLC(
-                                        CCommsDatabase& aDb,
-                                        TInt aIspFilter,
-                                        TInt aBearerFilter,
-                                        TInt aSortType,
-                                        TInt aReqIpvType,
-                                        TVpnFilterType aVpnFilterType,
-                                        TBool aIncludeEasyWlan );
-
-
-        /**
-        * Destructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C virtual ~CApSelect();
-
-
-    protected:      // Constructors
-
-        /**
-        * C++ default constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C CApSelect();
-
-
-        /**
-        * Second-phase constructor.
-        * @param aDb a pointer to a CCommsDataBase.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * Possible values are:
-        * KEApIspTypeInternetOnly, KEApIspTypeWAPOnly,
-        * KEApIspTypeInternetAndWAP, KEApIspTypeWAPMandatory
-        * KEApIspTypeAll and their combinations.
-        * @param aBearerFilter Filtering criteria on bearer type
-        * Possible values are the TApBearer enums and
-        * their combinations (or-ed).
-        * @param aSortType Specifies the sort order to use.
-        * Possible values are:
-        * KEApSortUidAscending, KEApSortUidDescending,
-        * KEApSortNameAscending, KEApSortNameDescending
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL(
-                                CCommsDatabase& aDb,
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType
-                                );
-
-
-        /**
-        * Second-phase constructor.
-        * @param aDb a pointer to a CCommsDataBase.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * Possible values are:
-        * KEApIspTypeInternetOnly, KEApIspTypeWAPOnly,
-        * KEApIspTypeInternetAndWAP, KEApIspTypeWAPMandatory
-        * KEApIspTypeAll and their combinations.
-        * @param aBearerFilter Filtering criteria on bearer type
-        * Possible values are the TApBearer enums and
-        * their combinations (or-ed).
-        * @param aSortType Specifies the sort order to use.
-        * Possible values are:
-        * KEApSortUidAscending, KEApSortUidDescending,
-        * KEApSortNameAscending, KEApSortNameDescending
-        * @param aReqIpvType Filtering criteria on the IPv type of the 
-        * access point. In case of GPRS, GPRS_PDP_TYPE holds it, while
-        * in case of CSD, all CSD access points are 
-        * considered to be IPv4 & IPv6 (both)
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL(
-                                CCommsDatabase& aDb,
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType,
-                                TInt aReqIpvType
-                                );
-
-
-        /**
-        * Second-phase constructor.
-        * @param aDb a pointer to a CCommsDataBase.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * Possible values are:
-        * KEApIspTypeInternetOnly, KEApIspTypeWAPOnly,
-        * KEApIspTypeInternetAndWAP, KEApIspTypeWAPMandatory
-        * KEApIspTypeAll and their combinations.
-        * @param aBearerFilter Filtering criteria on bearer type
-        * Possible values are the TApBearer enums and
-        * their combinations (or-ed).
-        * @param aSortType Specifies the sort order to use.
-        * Possible values are:
-        * KEApSortUidAscending, KEApSortUidDescending,
-        * KEApSortNameAscending, KEApSortNameDescending
-        * @param aReqIpvType Filtering criteria on the IPv type of the 
-        * access point. In case of GPRS, GPRS_PDP_TYPE holds it, while
-        * in case of CSD, all CSD access points are 
-        * considered to be IPv4 & IPv6 (both)
-        * @param aVpnFilterType a TVpnFilterType enum specifying the 
-        * vpn filtering.
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL( CCommsDatabase& aDb,
-                                 TInt aIspFilter,
-                                 TInt aBearerFilter,
-                                 TInt aSortType,
-                                 TInt aReqIpvType,
-                                 TVpnFilterType aVpnFilterType 
-                                 );
-                                 
-        /**
-        * Second-phase constructor.
-        * @param aDb a pointer to a CCommsDataBase.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * Possible values are:
-        * KEApIspTypeInternetOnly, KEApIspTypeWAPOnly,
-        * KEApIspTypeInternetAndWAP, KEApIspTypeWAPMandatory
-        * KEApIspTypeAll and their combinations.
-        * @param aBearerFilter Filtering criteria on bearer type
-        * Possible values are the TApBearer enums and
-        * their combinations (or-ed).
-        * @param aSortType Specifies the sort order to use.
-        * Possible values are:
-        * KEApSortUidAscending, KEApSortUidDescending,
-        * KEApSortNameAscending, KEApSortNameDescending
-        * @param aReqIpvType Filtering criteria on the IPv type of the 
-        * access point. In case of GPRS, GPRS_PDP_TYPE holds it, while
-        * in case of CSD, all CSD access points are 
-        * considered to be IPv4 & IPv6 (both)
-        * @param aVpnFilterType a TVpnFilterType enum specifying the 
-        * vpn filtering.
-        * @param aIncludeEasyWlan TBool specifying whther to include
-        * EasyWlan access point in the list or not...
-        *
-        * @deprecated
-        */                                 
-        IMPORT_C void ConstructL( CCommsDatabase& aDb,
-                                 TInt aIspFilter,
-                                 TInt aBearerFilter,
-                                 TInt aSortType,
-                                 TInt aReqIpvType,
-                                 TVpnFilterType aVpnFilterType,
-                                 TBool aIncludeEasyWlan );
-                                 
-    public: // New functions
-        /**
-        * Sets filters and sorting order for the list of available
-        * access points
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * Possible values are:
-        * KEApIspTypeInternetOnly, KEApIspTypeWAPOnly,
-        * KEApIspTypeInternetAndWAP,
-        * KEApIspTypeWAPMandatory, KEApIspTypeAll and their combinations.
-        * @param aBearerFilter Filtering criteria on bearer type
-        * Possible values are the TApBearer enums and
-        * their combinations (or-ed).
-        * @param aSortType Specifies the sort order to use.
-        * Possible values are:
-        * KEApSortUidAscending, KEApSortUidDescending,
-        * KEApSortNameAscending, KEApSortNameDescending
-        *
-        * @deprecated
-        */
-        IMPORT_C void SetFiltersL(
-                                 TInt aIspFilter,
-                                 TInt aBearerFilter,
-                                 TInt aSortType
-                                 );
-
-
-
-        /**
-        * Gets the current ISP-type filter
-        * @return The current ISP-type filter
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt IspTypeFilter();
-
-
-        /**
-        * Gets the current bearer-type filter
-        * @return The current bearer-type filter
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt BearerFilter();
-
-
-        /**
-        * Gets the current sorting order
-        * @return The current sorting order
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt SortOrder();
-
-
-        /**
-        * Navigates to the first access point in the list.
-        * @return Boolean indicating the success of the operation.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool  MoveToFirst();
-
-
-        /**
-        * Navigates to the next access point in the list.
-        * @return Boolean indicating the success of the operation.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool  MoveNext();
-
-
-        /**
-        * Navigates to the last access point in the list.
-        * @return Boolean indicating the success of the operation.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool  MoveLast();
-
-
-        /**
-        * Navigates to the previous access point in the list.
-        * @return Boolean indicating the success of the operation.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool  MovePrev();
-
-
-        /**
-        * Counts the items in the list
-        * @return The number of items in the list.
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 Count();
-
-
-        /**
-        * Gets the name of the 'current' access point
-        * Ownership of the returned text is not passed.
-        * @return The name of the current access point
-        *
-        * @deprecated
-        */
-        IMPORT_C const TDesC& Name();
-
-
-        /**
-        * Gets the UID of the current access point
-        * @return The UID of the current access point
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 Uid();
-
-
-        /**
-        * Gets the ISP-type of the current access point
-        * @return The ISP-type of the current access point.
-        *
-        * @deprecated
-        */
-        IMPORT_C TCommsDbIspType Type();
-
-
-        /**
-        * Gets the bearer-type of the current access point
-        * @return The bearer-type of the current access point.
-        *
-        * @deprecated
-        */
-        IMPORT_C TApBearerType BearerType();
-
-
-        /**
-        * Provides all data in a CApListItemList array.
-        * @param aList A reference to a CApListItemList object
-        * to hold the values.
-        * @return The number of items in the list.
-        * All elements in the aList array and their memory
-        * will be freed inside the routine.
-        * The routine expands or shrinks the array as necessary
-        * to minimize memory consumption.
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt AllListItemDataL( CApListItemList& aList );
-
-        /**
-        * Returns whether the current item is read-only or not.
-        * @return Returns whether the current item is read-only or not.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool IsReadOnly() const;
-
-    private:
-        /**
-        * This function updates the member data according to the
-        * current filter settings.
-        * @return Error code.
-        */
-        TInt DoUpdateL();
-
-
-        /**
-        * Gets the filtered and sorted wap table
-        * and places it on the Cleanupstack
-        */
-        CCommsDbTableView* GetFilteredSortedWapTableViewLC();
-
-
-        /**
-        * Gets the filtered and sorted IP bearer table
-        * and places it on the Cleanupstack
-        */
-        CCommsDbTableView* GetFilteredSortedIpBearerTableViewLC();
-
-
-        /**
-        * Gets the filtered and sorted ISP table
-        * and places it on the Cleanupstack
-        */
-        CCommsDbTableView* GetFilteredSortedIspOutTableViewLC();
-
-
-        /**
-        * Gets the filtered and sorted GPRS table
-        * and places it on the Cleanupstack
-        */
-        CCommsDbTableView* GetFilteredSortedGprsTableViewLC( TBool aIn );
-
-        /**
-        * Reads up the specified columns TUint32 values stored
-        * in the table and returns it in the passed array
-        */
-        void GetUintValuesL
-                (
-                CCommsDbTableView* aTable,
-                const TDesC& aField,
-                CArrayFixFlat<TUint32>& aArray
-                );
-
-
-        /**
-        * Reads up the protection values stored
-        * in the table and returns it in the passed array
-        */
-        void GetProtValuesL( CCommsDbTableView* aTable,
-                             CArrayFixFlat<TUint32>& aArray );
-
-        /**
-        * Reads up the specified columns text values stored
-        * in the table and returns it in the passed array
-        */
-        void GetTextValuesL
-                (
-                CCommsDbTableView* aTable,
-                const TDesC& aField,
-                CArrayPtrFlat<HBufC>& aArray
-                );
-
-
-        /**
-        * Reads up the specified columns long text values stored
-        * in the table and returns it in the passed array
-        */
-        void GetLongTextValuesL
-                (
-                CCommsDbTableView* aTable,
-                const TDesC& aField,
-                CArrayPtrFlat<HBufC>& aArray
-                );
-
-
-        /**
-        * Returns whether a given value is in the given array or not
-        */
-        TBool IsInArray( CArrayFixFlat<TUint32>* aArray, TUint32 aValue );
-
-
-        /**
-        * Returns the position of a given value in the given array.
-        */
-        TInt PosInArray( CArrayFixFlat<TUint32>* aArray, TUint32 aValue );
-
-
-        /**
-        * Returns the position of an item with a given UID in the given list.
-        */
-        TInt GetItemPos( CApListItemList* aTmpApList, TUint32 aId );
-
-
-        /**
-        * Opens a view on the given table where a given text coloumn has
-        * a given value
-        * @return the opened view on the table
-        */
-        CCommsDbTableView* OpenViewMatchingTextL
-                                (
-                                const TDesC& aTableName,
-                                const TDesC& aColumnToMatch,
-                                const TDesC16& aValueToMatch
-                                );
-
-        /**
-        * Gets the ISP values (ISP UID, ISP type, ISP bearer type)
-        * from a given table
-        * @param aTable the table to go through (already filtered & ordered)
-        * @param aArray An array to hold the readed values
-        * @param aColName Column name (different column names are used for
-        * CSD/GPRS/CDMA.
-        */
-        void GetIspValuesL
-                (
-                CCommsDbTableView* aTable,
-                CArrayFixFlat<TUint32[3]>* aArray,
-                const TDesC& aColName
-                );
-
-        /**
-        * Gets the position of an element with a given IAP UID
-        */
-        TInt GetIapPos
-                (
-                CArrayFixFlat<TUint32[3]>* aArray,
-                TUint32 aValue
-                );
-
-        /**
-        * Sorts the data according to localised sorting on the 
-        * access point names, using CompareC
-        */
-        void SortLocalisedNameL( TBool aAscending = ETrue );
-
-
-        /**
-        * Sorts the data according to Uids
-        */
-        void SortUidL( TBool aAscending = ETrue );
-
-
-
-    private:    // New functions
-        /**
-        * Sets filters and sorting order for the list of available
-        * access points
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * Possible values are:
-        * KEApIspTypeInternetOnly, KEApIspTypeWAPOnly,
-        * KEApIspTypeInternetAndWAP,
-        * KEApIspTypeWAPMandatory, KEApIspTypeAll and their combinations.
-        * @param aBearerFilter Filtering criteria on bearer type
-        * Possible values are the TApBearer enums and
-        * their combinations (or-ed).
-        * @param aSortType Specifies the sort order to use.
-        * Possible values are:
-        * KEApSortUidAscending, KEApSortUidDescending,
-        * KEApSortNameAscending, KEApSortNameDescending
-        * @param aReqIpvType The filtering criteria for IPv type
-        * @param aVpnFilterType The Vpn filtering type, TVpnFilterType values
-        */
-        void SetFiltersL( TInt aIspFilter,
-                          TInt aBearerFilter,
-                          TInt aSortType,
-                          TInt aReqIpvType,
-                          TInt aVpnFilterType
-                         );
-
-
-        /**
-        * Returns a pointer to the opened VPN_SERVICE table
-        */
-        CCommsDbTableView* GetVpnTableViewLC();
-
-
-        /**
-        * Gets the VPN values (VPN IAP UID, VPN HOME IAP UID, VPN Name )
-        * from the given VPN table
-        * @param aTable the table to go through (already filtered & ordered)
-        * @param aVpnArray An array to hold the readed vpn data values
-        */
-        void GetVpnValuesL( CCommsDbTableView* aTable, 
-                            CArrayFixFlat<TVpnData>* aVpnArray );
-
-
-        /**
-        * Returns the supported bearer set from the passed requested bearer set
-        * @param aBearerFilter The requested bearer set
-        * return The supported subset of the requested bearers.
-        */
-        TInt GetSupportedBearerSet( TInt aBearerFilter );
-
-
-        /**
-        * Adding WLAN or LAN access points to existing list.
-        * aWlan a TBool specifying whether WLAN or LAN
-        */
-        void AddLanL( TBool aWlan );
-
-
-
-
-    private:    // Data
-        CCommsDatabase*             iDb;    // Does not own it!
-        TInt                        iIsp;
-        TInt                        iBearer;
-        TInt                        iSort;
-        CApListItemList*            iApList;
-        TInt                        iCursor;
-        TInt                        iCount;
-        TSelectExtra*               iExt;
-
-    };
-
-#endif      // CAPSELECT_H
-
-// End of File
--- a/ipcm_pub/access_point_engine_api/inc/APUtils.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,422 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the class CApUtils
-*     Contains utility functions for access point handling
-*
-*/
-
-
-#ifndef APUTILS_H
-#define APUTILS_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
- 
-//  INCLUDES
-#include <commdb.h>
-#include <ApEngineVer.h>
-#include <ApEngineConsts.h>
-
-
-
-// extra data holder.
-typedef struct
-    {
-    TInt    iVariant;               /// Local variant value
-    TBool   iWlanSupported;         /// WLAN feature supported or not
-    TBool   iIsFeatureManagerInitialised;
-    }TUtilsExtra;
-
-
-// CLASS DECLARATION
-
-/**
-*  Representation of access point utilities.
-*  Provides utilities to access points for clients.
-*  Encapsulates database handling.
-*  This class provides utility functions for clients that need some
-*  specific information or parameters from (maybe more than one) AP.
-*  It is provided for ease of use so clients do not have to work with
-*  CApDataHandler's concept (one object-one Uid).
-*/
-class CApUtils :public CBase
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack.
-        * @param aDb a reference to a CCommsDataBase object.
-        * @return The constructed CApUtils.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApUtils* NewLC( CCommsDatabase& aDb );
-
-
-        /**
-        * Destructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C virtual ~CApUtils();
-
-
-protected: // Constructors
-        /**
-        * C++ default constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C CApUtils();
-
-        /**
-        * Second-phase constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL( CCommsDatabase& aDb );
-
-
-
-
-    public: // New functions
-
-        /**
-        * Indicates whether a given access point is in use or not.
-        * If access point does not exists, return value is TRUE
-        * @param aUid The UID of the access point.
-        * @return Boolean indicating if it is in use (if used, TRUE)
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool IsAPInUseL( TUint32 aUid );
-
-
-        /**
-        * Indicates the WAP bearer type of a given access point.
-        * Passed descriptor MUST be large enough to hold the new data,
-        * otherwise leaves with KErrDescOverflow.
-        * The maximum length is the maximum length of a 'normal' text fields
-        * length in Comms DB, KCommsDbSvrMaxFieldLength,
-        * which is defined in cdblen.h.
-        * @param aUid The UID of the access point.
-        * @param aBearer A reference to a TBearer to hold the bearer
-        * type of the access point.
-        * @return no return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void WapBearerTypeL( TUint32 aUid, TDes& aBearer );
-
-
-        /**
-        * Gets the bearer type of a given access point. Leaves on error.
-        * @param aUid The UID of the access point.
-        * @return The type of the bearer.
-        *
-        * @deprecated
-        */
-        IMPORT_C TApBearerType BearerTypeL( TUint32 aUid );
-
-
-
-        /**
-        * Indicates the ISP type of a given access point.
-        * @param aUid The UID of the access point.
-        * @param aIspType A reference to a TCommsDbIspType to hold the value
-        * @return No return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void ISPTypeL( TUint32 aUid, TCommsDbIspType& aIspType );
-
-        /**
-        * Indicates whether a given name is valid or not.
-        * @param aNameText The name to check.
-        * @return Boolean indicating if it is valid or not.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool IsValidNameL( const TDesC& aNameText );
-
-
-        /**
-        * TBool CApUtils::MakeValidNameL(TDes& aNameText);
-        * Creates a valid name based on the given one.
-        * @param aNameText The name to use for creating a valid name.
-        * The new name is returned in it, too.
-        * @return Whether the name was changed or not
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool MakeValidNameL( TDes& aNameText );
-
-
-        /**
-        * Reads the Name of a given access point
-        * @param aUid The UID of the access point.
-        * @param A reference to hold the name of the access point.
-        * @return no return value.
-        * Passed descriptor MUST be large enough to hold the new data,
-        * otherwise leaves with KErrDescOverflow.
-        *
-        * @deprecated
-        */
-        IMPORT_C void NameL( TUint32 aUid, TDes& aName );
-
-
-        /**
-        * Sets the Name of a given access point
-        * Name is validated and modified if needed.
-        * Passed aName buffer MUST be large enough to hold the modified name.
-        * @param aName A reference to the name of the access point.
-        * The given name is returned in it.
-        * @param aUid The UID of the access point.
-        * @return no return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void SetNameL( TDes& aName, TUint32 aUid );
-
-
-        /**
-        * Sets the ISP type for a given access point
-        * @param aUid The UID of the access point
-        * @param aIspType The desired Isp type of the access point
-        * @return no return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void SetISPTypeL( TUint32 aUid, TCommsDbIspType aIspType );
-
-
-        /**
-        * Gets the Iap record ID for a given access point ID
-        * @param aUid The UID of the access point
-        * @return The Iap record ID.
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 IapIdFromWapIdL( TUint32 aUid );
-
-
-        /**
-        * Gets the Wap record ID for a given Iap record ID
-        * @param aUid The UID of the Iap
-        * @return The Wap access point ID.
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 WapIdFromIapIdL( TUint32 aUid );
-
-
-
-        /**
-        * Returns whether the access point has the WAP-mandatory
-        * fields filled or not.
-        * Starts a transaction which is 'internal' to ApEngine if
-        * client not started one.
-        * @param  aUid The UID of the access point
-        * @return TBool Are the WAP-mandatory fields filled in the access point?
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool HasMandatoryFieldsFilledL( TUint32 aUid );
-
-        /**
-        * Returns in a TBool whether the internet access point part
-        * identified by the passed aUid exists or not.
-        * param aUid the internet access point ID to check for
-        * (NOT equals to Wap access point ID).
-        * return TBool indicating whether an internet access point
-        * with the given ID exists or not.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool IAPExistsL( TUint32 aUid );
-
-        /**
-        * Returns in a TBool whether the access point identified
-        * by the passed aUid exists or not.
-        * @param aUid the access point ID to check for.(Wap access point ID).
-        * @return TBool indicating whether an access point with the
-        * given ID exists or not.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool WapApExistsL( TUint32 aUid );
-
-        /**
-        * Returns whether the access point has the WAP-mandatory
-        * fields filled or not.
-        * @param  aUid The UID of the access point
-        * @return TBool Are the WAP-mandatory fields filled in the access point?
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool DoHasMandatoryFieldsFilledL(
-                        TUint32 aUid,
-                        CCommsDbTableView* aWapt = NULL,
-                        TApBearerType aBearertype = EApBearerTypeAllBearers );
-
-
-        /**
-        * Indicates whether a given name is valid or not.
-        * The name is valid if none, or only the aAcceptUid AP has it.
-        * @param aNameText The name to check.
-        * @param aAcceptUid A UID to accept with this name
-        * @return Boolean indicating if it is valid or not.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool IsValidNameL( const TDesC& aNameText,
-                                     TUint32 aAcceptUid );
-
-
-        /**
-        * Determines whether a given AP is read-only or not.
-        * @param aUid A UID to look for
-        * @return Boolean indicating if it is read-only or not.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool IsReadOnlyL( TUint32 aUid );
-
-
-
-        /**
-        * Determines whether a given LAN_SERVICE commsdb id 
-        * is linked to a WLAN data (thus is it a WLAN) or not.
-        * @param aUid A UID to look for
-        * @return Boolean indicating if it is WLAN or not.
-        */
-        TBool IsWlanL( TUint32 aLanCommdbId );
-        
-        
-        
-        
-        /**
-        * Determines whether a given LAN_SERVICE commsdb id 
-        * which is linked to a WLAN data (thus is it a WLAN) 
-        * has a valid SSID or it is empty
-        * @param aUid A UID to look for
-        * @return Boolean indicating if it has WLAN SSID or not.
-        */
-        TBool HasWlanSSIDL( TUint32 aLanCommdbId );
-        
-    protected:
-
-
-        /**
-        * Indicates the WAP bearer type of a given access point.
-        * Passed descriptor MUST be large enough to hold the new data,
-        * otherwise leaves with KErrDescOverflow.
-        * The maximum length is the maximum length of a 'normal' text fields
-        * length in Comms DB, KCommsDbSvrMaxFieldLength,
-        * which is defined in cdblen.h.
-        * @param aUid The UID of the access point.
-        * @param aBearer A reference to a TBearer to hold the bearer
-        * type of the access point.
-        * @return no return value.
-        */
-        void DoWapBearerTypeL( TUint32 aUid, TDes& aBearer );
-
-
-        /**
-        * Gets the bearer type of a given access point. Leaves on error.
-        * @param aUid The UID of the access point.
-        * @return The type of the bearer.
-        */
-        TApBearerType DoBearerTypeL( TUint32 aUid );
-
-
-        /**
-        * Indicates the ISP type of a given access point.
-        * @param aUid The UID of the access point.
-        * @param aIspType A reference to a TCommsDbIspType to hold the value
-        * @return No return value.
-        */
-        void DoISPTypeL( TUint32 aUid, TCommsDbIspType& aIspType );
-
-
-        /**
-        * Reads the Name of a given access point
-        * @param aUid The UID of the access point.
-        * @param A reference to hold the name of the access point.
-        * @return no return value.
-        * Passed descriptor MUST be large enough to hold the new data,
-        * otherwise leaves with KErrDescOverflow.
-        */
-        void DoNameL( TUint32 aUid, TDes& aName );
-
-
-        /**
-        * Sets the Name of a given access point
-        * Name is validated and modified if needed.
-        * Passed aName buffer MUST be large enough to hold the modified name.
-        * @param aName A reference to the name of the access point.
-        * The given name is returned in it.
-        * @param aUid The UID of the access point.
-        * @return no return value.
-        */
-        void DoSetNameL( TDes& aName, TUint32 aUid );
-
-
-        /**
-        * Sets the ISP type for a given access point
-        * @param aUid The UID of the access point
-        * @param aIspType The desired Isp type of the access point
-        * @return no return value.
-        */
-        void DoSetISPTypeL( TUint32 aUid, TCommsDbIspType aIspType );
-
-
-        /**
-        * Returns in a TBool whether the record
-        * identified by the passed aUid exists or not
-        * in the table identified by the passed table name.
-        * @param aTable The name of the table to check
-        * @param aUid The UID to check for
-        * @return TBool indicating whether the record
-        * with the given ID exists in the given table or not.
-        */
-        TBool DoesExistsL( TPtrC aTable, TUint32 aUid );
-
-
-        /**
-        * Wrapper for public API.
-        * Determines whether a given LAN_SERVICE commsdb id 
-        * is linked to a WLAN data (thus is it a WLAN) or not.
-        * @param aUid A UID to look for
-        * @return Boolean indicating if it is WLAN or not.
-        */
-        TBool DoIsWlanL( TUint32 aLanCommdbId );
-        
-        
-    private:    // Data
-        CCommsDatabase* iDb;
-        // TCommDbDatabaseType iDbType; // deprecated and not used but kept 
-        // to maintain class size for BC
-        // Added a new iExt for expansion instead of TCommDbDatabaseType 
-        // same size, no BC problem...
-        TUtilsExtra*  iExt;
-
-
-    };
-
-#endif      // APUTILS_H
-
-// End of File
--- a/ipcm_pub/access_point_engine_api/inc/ActiveApDb.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,194 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of classes CActiveApDb
-*               and MActiveApDbObserver.
-*
-*/
-
-
-#ifndef ACTIVE_APDB_H
-#define ACTIVE_APDB_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
-
-//  INCLUDES
-#include <commdb.h>
-#include <ApEngineVer.h>
-
-/*
-// Enum for DATABASE_TYPE field
-// Will be deprecated in 7.0
-enum TCommDbDatabaseType
-    {
-    EUnspecified = 0,   // not specifying which type it is - any type of 
-                        // database can be opened with this parameter
-    EIAP,
-    EISP
-    };
-*/
-
-// CONSTANTS
-const TInt KErrActiveApDbObserverNotFound = -500;
-
-// FORWARD DECLARATION
-class CActiveApDbNotifier;
-
-// CLASS DECLARATION
-
-/**
-* Mixin protocol for handling events from a CCommsDatabase.
-* Events are related to database changes and availability.
-*/
-class MActiveApDbObserver
-    {
-    public:     // types
-        enum TEvent       /// Events reported to the database observer.
-            {
-            EDbChanged,   ///< Database has changed.
-            EDbClosing,   ///< Database is about to close.
-            EDbAvailable  ///< Database is available again.(E.g. after unlock)
-            };
-
-    public:     // new methods
-
-        /**
-        * Derived classes should implement this method, and act accordingly
-        * to database events.
-        * @param anEvent Database-related event.
-        *
-        * @deprecated
-        */
-        IMPORT_C virtual void HandleApDbEventL( TEvent anEvent ) = 0;
-
-    };
-
-/**
-* This class manages and guards database integrity
-* by handling all events that are related to the database. These events
-* may originate from the system (Shutdown, Backup/Restore) and from the
-* database itself. The events are transformed into a simple protocol,
-* defined by MActiveApDbObserver.
-* Expects an active scheduler to be installed and running.
-*/
-NONSHARABLE_CLASS( CActiveApDb ) : public CBase
-    {
-
-    public:     // Constructors and destructor
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * @param aType The desired type of the CCommsDatabase object.
-        * Defaults to EDatabaseTypeIAP.
-        * @return The constructed CActiveApDb object.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CActiveApDb* NewL
-            ( TCommDbDatabaseType aType = EDatabaseTypeIAP );
-
-
-
-        /**
-        * Destructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C virtual ~CActiveApDb();
-
-    protected:  // Constructors
-
-        /**
-        * Second phase constructor. Leaves on failure.
-        * @param aType The desired type of the CCommsDatabase object.
-        * events.
-        */
-        void ConstructL();
-
-    public:     // new methods
-        /**
-        * Adds an observer to the list of observers to be notified
-        * about the DB events.
-        * Also automatically starts observation and notification.
-        * The order of notification will be exactly the order of registration.
-        * @param anObserver Observer to be notified about database-related
-        * events.
-        *
-        * @deprecated
-        */
-        IMPORT_C void AddObserverL( MActiveApDbObserver* anObserver );
-
-
-        /**
-        * Removes an observer. If not added, silently ignores.
-        * @param anObserver The observer.
-        *
-        * @deprecated
-        */
-        IMPORT_C void RemoveObserver( MActiveApDbObserver* anObserver );
-
-
-        /**
-        * Returns the CCommsDatabase.
-        * Required because we can not derive from CCommsDatabase...
-        *
-        * @deprecated
-        */
-        IMPORT_C CCommsDatabase*  Database();
-
-    private:
-        /**
-        * Handle events from the database (DBMS).
-        * The order of notification is the order of registration.
-        * @param anEvent Event generated by DBMS. Values from
-        * RDbNotifier::TEvent, or KErrCancel.
-        */
-        void HandleDbEventL( TInt anEvent );
-
-
-        /**
-        * Notify all observers about an event.
-        * @param anEvent Event to be sent to observers.
-        */
-        void NotifyObserversL( MActiveApDbObserver::TEvent anEvent );
-
-    friend class CActiveApDbNotifier;
-
-    private:    // types
-        /**
-        * Default constructor. Can not leave.
-        */
-        CActiveApDb();
-
-
-        enum TState             /// State of the finite state machine.
-            {
-            EClosed,            ///< Closed and idle.
-            EReady,             ///< Open and ready for use.
-            EWaitClose,         ///< Closed, waiting for other users to close.
-            EWaitBackupRestore, ///< Closed, waiting Backup/Restore to finish.
-            EWaitShutdown       ///< Closed, waiting to die.
-            };
-
-    private:        // Data
-        CArrayPtrFlat<MActiveApDbObserver>* iObservers;   ///< Observers.
-
-        CCommsDatabase*     iDb;    // Creates & owns it !
-        // CommsDb has its own RDbNotifier...
-        TState iState;  ///< Current state of the database.
-        CActiveApDbNotifier*    iDbNotifier;
-    };
-
-#endif
-
-// End of File
--- a/ipcm_pub/access_point_engine_api/inc/ApEngineConsts.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,279 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Used constants of the ApEngine.
-*
-*/
-
-
-#ifndef APENGINE_CONSTS_H
-#define APENGINE_CONSTS_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
- 
-#include <ApEngineVer.h>
-
-
-// ERROR CODES
-// Used either as return values or leave codes. Apart from these, system error
-// codes can also be returned or leaved with.
-
-/// Attempting to read or write a column which does not exists.
-const TInt  KErrInvalidColumn       = -300;
-
-/// The given bearer is not valid.
-const TInt  KErrInvalidBearer       = -301;
-
-/// The type of the database is not valid
-const TInt  KErrInvalidDatabaseType = -302;
-
-/// The name of the AP is not valid (length = 0)
-const TInt  KErrInvalidName         = -303;
-
-const TInt  KErrDescOverflow        = -304;
-
-/// The passed pointer was invalid = NULL
-const TInt  KErrNullPointerPassed   = -305;
-
-/// The filter is not valid
-const TInt  KErrInvalidFilterType   = -310;
-
-/// The bearer is not valid
-const TInt  KErrInvalidBearerType   = -311;
-
-/// The ISP type given is invalid
-const TInt  KErrInvalidIspRequest   = -312;
-
-/// Used when the requested value was not specified in the database
-const TInt  KErrValueUnspecified    = -323;
-
-const TInt  KApEngineMaxSql              = 255;
-
-
-
-/// These constants are used to represent the sorting order used in CApSelect.
-const TInt  KEApSortUidAscending         = 0x00000001;  ///< The sorting is
-                                                        ///< done according to
-                                                        ///< the ID of the
-                                                        ///< access points in
-                                                        ///< ascending order.
-const TInt  KEApSortUidDescending        = 0x00000002;  ///< The sorting is
-                                                        ///< done according to
-                                                        ///< the ID of the
-                                                        ///< access points in
-                                                        ///< descending order.
-const TInt  KEApSortNameAscending        = 0x00000003;  ///< The sorting is
-                                                        ///< done according to
-                                                        ///< the name of the
-                                                        ///< access points in
-                                                        ///< ascending order.
-const TInt  KEApSortNameDescending       = 0x00000004;  ///< The sorting is
-                                                        ///< done according to
-                                                        ///< the name of the
-                                                        ///< access points in
-                                                        ///< descending order.
-
-
-/// These enums are used to represent one the filtering criterias in CApSelect.
-const TInt  KEApIspTypeInternetOnly     = 0x00000001;   ///< Filter allows only
-                                                        ///< access points that
-                                                        ///< are capable of
-                                                        ///< only internet
-                                                        ///< access.
-const TInt  KEApIspTypeWAPOnly          = 0x00000002;   ///< Filter allows only
-                                                        ///< access points that
-                                                        ///< are capable of
-                                                        ///< only WAP access.
-const TInt  KEApIspTypeInternetAndWAP   = 0x00000004;   ///< Filter allows only
-                                                        ///< access points that
-                                                        ///< are capable of
-                                                        ///< internet AND
-                                                        ///< WAP access.
-const TInt  KEApIspTypeWAPMandatory     = 0x00000008;   ///< Filter allows only
-                                                        ///< access points that
-                                                        ///< are capable of
-                                                        ///< WAP access AND
-                                                        ///< contain mandatory
-                                                        ///< WAP settings.
-const TInt  KEApIspTypeAll              = 0x00000010;   ///< No filtering is
-                                                        ///< done, all access
-                                                        ///< points are shown.
-const TInt  KEApIspTypeMMSMandatory     = 0x00000020;   ///< Filter allows only
-                                                        ///< access points that
-                                                        ///< are capable of MMS
-                                                        ///< and contain MMS
-                                                        ///< mandatory settings
-                                                        ///< Starting Page
-
-
-
-
-const TInt KModifiableTextLength        = 100;
-const TInt KModifiableLongTextLength    = 1000;
-
-
-// typedef
-enum TApBearerType      /// These enums are used to represent the possible
-                        /// bearer types and the filtering criteria
-                        /// in CApSelect.
-    {
-    EApBearerTypeCSD        = 0x00000001,   ///< Filter allows only access
-                                            ///< points that has CSD as bearer.
-    EApBearerTypeGPRS       = 0x00000002,   ///< Filter allows only access
-                                            ///< points that has GPRS as bearer
-    EApBearerTypeHSCSD      = 0x00000004,   ///< Filter allows only access
-                                            ///< points that has HSCSD
-                                            ///< as bearer.
-
-// Will be deprecated, use EApBearerTypeAllBearers instead !
-    EApBearerTypeAll        = 0x00000008,   ///< No filtering is done,
-                                            ///< all access points are shown.
-                                            
-    EApBearerTypeCDMA       = 0x00000010,   ///< Filter allows only access
-                                            ///< points that has CDMA as bearer
-    EApBearerTypeWLAN       = 0x00000020,   ///< Filter allows only access
-                                            ///< points that has WLAN as bearer
-    EApBearerTypeLAN        = 0x00000040,   ///< Filter allows only access
-                                            ///< points that has LAN as bearer
-    EApBearerTypeLANModem   = 0x00000080,   ///< Filter allows only access
-                                            ///< points with LAN modem bearer
-    EApBearerTypeAllBearers = 0xffffffff    ///< No filtering is done,
-                                            ///< all access points are shown.
-    };
-
-
-enum TApCallSpeed       /// These enums are used to represent
-                        /// the connection speed.
-    {
-    KSpeedAutobaud=0x00000000,          ///< Autodetect
-    KSpeed9600=0x00000001,              ///< 9600
-    KSpeed14400=0x00000002,             ///< 14400
-    KSpeed19200=0x00000003,             ///< 19200
-    KSpeed28800=0x00000004,             ///< 28800
-    KSpeed38400=0x00000005,             ///< 38400
-    KSpeed43200=0x00000006,             ///< 43200
-    KSpeed56000=0x00000007              ///< 56000
-    };
-
-
-enum TApCallType        /// These enums are used to represent
-                        /// the conn. type Analogue/ISDNv110/ISDNv120
-    {
-    ECallTypeAnalogue,          ///< Analogue
-    ECallTypeISDNv110,          ///< ISDN v. 110
-    ECallTypeISDNv120           ///< ISDN v. 120
-    };
-
-const TUint32 KMaxAnalogueSpeed    = KSpeed28800;
-const TUint32 KMaxIsdnSpeed        = KSpeed43200;
-
-//if WCDMA is enabled, then the max speed are :
-const TUint32 KMaxAnalogueSpeedWcdma    = KSpeed28800;
-const TUint32 KMaxIsdnSpeedWdma         = KSpeed56000;
-
-
-enum TIPvType
-    {
-    EIPv4       = 1,
-    EIPv6       = 2
-    };
-
-
-enum TWlanNetMode
-    {
-    EAdhoc       = 0,
-    EInfra       = 1
-    };
-
-
-enum TWlanSecMode
-    {
-    EOpen       = 1,
-    EWep        = 2,
-    E802_1x     = 4,
-    EWpa        = 8,
-    EWpa2       = 16
-    };
-
-
-#define KApMaxConnNameLength            30
-
-// The following constants are deprecated, DO NOT USE THEM!
-// DO NOT USE STARTS
-#define KApMaxGprsApNameLength          100
-#define KApMaxLoginNameLength           32
-#define KApMaxStartPageLength           1000
-#define KApMaxAccessNumLength           21
-#define KApCBInfoLength                 21
-#define KApMaxServiceCentreAddrLength   21
-#define KApMaxIpAddressLength           100
-#define KApMaxLoginScriptLength         1000
-#define KApMaxLoginPasswordLength       20
-// DO NOT USE ENDS
-
-
-_LIT( KSqlSelectNum, "SELECT %s from %s WHERE %s=%d" );
-_LIT( KSqlSelectBaseNum, "SELECT * from %s WHERE %s=%d" );
-
-/// 'Dynamic' IP address to use in comparisons
-_LIT( KDynIpAddress, "0.0.0.0" );
-
-/// A start page, which have to be considered as invalid.
-_LIT( KInvStartPage, "http://" );
-
-/// A name for the 'location' to use
-_LIT( KLocation, "Mobile" );
-
-
-/// Modem bearer names for (HS)CSD Access Points
-_LIT( KModemBearerCSD, "CSD Modem" ); 
-
-/// Modem bearer names for GPRS/WCDMA Access Points
-_LIT( KModemBearerGPRS, "GPRS Modem" );
-
-/// Modem bearer names for CDMA Access Points
-_LIT( KModemBearerCDMA, "CDMA Modem" );
-
-/// Modem bearer names for WLAN Access Points
-_LIT( KModemBearerWLAN, "WLANBearer" );
-
-/// Modem bearer names for LAN Access Points
-_LIT( KModemBearerLAN, "LANBearer" );
-
-/// Modem bearer names for LAN Modem Access Points
-_LIT( KModemBearerLANModem, "LANModem" );
-
-
-/// Number of retries that are used in database operations
-const TInt KRetryCount              = 5;
-
-
-/// Time to wait before retry database operation 
-// (==0.10 secs = 100000microsec.)
-#define KRetryWait  100000 /* in TTimeIntervalMicroSeconds32 */
-
-// callback timeout in microseconds
-const TUint32 KCallBackTimeOut  = 60000000;
-
-_LIT( KDynIpv6Address, "0:0:0:0:0:0:0:0" );
-
-
-_LIT( KDaemonManagerName, "NetCfgExtnDhcp" );
-_LIT( KConfigDaemonName, "!DhcpServ" );
-
-
-#endif
-
-// End of File
--- a/ipcm_pub/access_point_engine_api/inc/ApEngineVer.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,30 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Defines used for version/behavioural control for the ApEngine.
-*
-*/
-
-
-#ifndef APENGINE_VER_H
-#define APENGINE_VER_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
-// #define     __PROXY_SETTINGS
-
-#endif
-
-// End of File
-
--- a/ipcm_pub/access_point_engine_api/inc/ApListItem.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,318 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declaration of the CApSelect class.
-*
-*/
-
-
-#ifndef CAPLISTITEM_H
-#define CAPLISTITEM_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
- 
-//  INCLUDES
-#include <commdb.h>
-#include <ApEngineVer.h>
-#include <ApEngineConsts.h>
-
-
-typedef struct
-    {
-    TBool           iReadOnly;      ///< Is the AP protected or not
-    TUint32         iIapId;         ///< The IAP UID of the item
-    TBool           iIsVpn;         ///< Is it a VPN or not?
-    }TApListItemExtra;
-
-
-// CLASS DECLARATION
-/**
-*  Representation of a list item.
-*/
-class CApListItem :public CBase
-                                         ///< This class is used to hold
-                                         ///< the main information of an
-                                         ///< access point.
-                                         ///< It is used in CApSelect.
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack.
-        * @return The constructed CApListItem.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApListItem* NewLC();
-
-
-        /**
-        * NOTE: This function is deprecated, use the one with the additional
-        * aStartPage parameter below.
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack.
-        * @param aIspType The type of the access point
-        * (Internet only, Wap only, Internet AND Wap)
-        * @param aUid The ID of the access point
-        * @param aName The name of the access point
-        * @param aBearerType The bearer type of the access point
-        * @return The constructed CApListItem.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApListItem* NewLC( TCommsDbIspType aIspType,
-                                            TUint32 aUid,
-                                            const TDesC& aName,
-                                            TApBearerType aBearerType );
-
-
-        /**
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack.
-        * @param aIspType The type of the access point
-        * (Internet only, Wap only, Internet AND Wap)
-        * @param aUid The ID of the access point
-        * @param aName The name of the access point
-        * @param aBearerType The bearer type of the access point
-        * @param aStartpage The starting page of the access point
-        * @param aReadOnly Whether the given item is read-only or not
-        * @return The constructed CApListItem.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApListItem* NewLC( TCommsDbIspType aIspType,
-                                            TUint32 aUid,
-                                            const TDesC& aName,
-                                            TApBearerType aBearerType,
-                                            const TDesC& aStartPage,
-                                            TBool aReadOnly = ETrue
-                                            );
-
-        /**
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack.
-        * @param aItem a pointer to a CApListItem.
-        * @return The constructed CApListItem.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApListItem* NewLC( CApListItem* aItem );
-
-
-        /**
-        * Destructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C virtual ~CApListItem();
-
-
-        /**
-        * Copies the data from another CApListItem
-        * Substitutes the "Assignment operator."
-        * @return No return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void CopyFromL( const CApListItem& aCopyFrom );
-
-
-
-    protected:      // Constructors
-        /**
-        * C++ default constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C CApListItem();
-
-        /**
-        * NOTE: This function is deprecated, use the one with the additional
-        * aStartPage parameter below.
-        * Second-phase constructor.
-        * @param aIspType The type of the access point
-        * (Internet only, Wap only, Internet AND Wap)
-        * @param aUid The ID of the access point
-        * @param aName The name of the access point
-        * @param aBearerType The bearer type of the access point
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL( TCommsDbIspType aIspType,
-                                  TUint32 aUid,
-                                  const TDesC& aName,
-                                  TApBearerType aBearerType );
-
-        /**
-        * Second-phase constructor.
-        * @param aIspType The type of the access point
-        * (Internet only, Wap only, Internet AND Wap)
-        * @param aUid The ID of the access point
-        * @param aName The name of the access point
-        * @param aBearerType The bearer type of the access point
-        * @param aStartpage The starting page of the access point
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL( TCommsDbIspType aIspType,
-                                  TUint32 aUid,
-                                  const TDesC& aName,
-                                  TApBearerType aBearerType,
-                                  const TDesC& aStartPage
-                                  );
-
-
-        /**
-        * Second-phase constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL();
-
-
-    public: // New functions
-
-        /**
-        * NOTE: This function is deprecated, use the one with the additional
-        * aStartPage parameter below.
-        * Sets item values of the access point. Leaves on failure.
-        * @param aIspType The type of the access point
-        * (Internet only, Wap only, Internet AND Wap)
-        * @param aUid The ID of the access point
-        * @param aName The name of the access point
-        * @param aBearerType The bearer type of the access point
-        *
-        * @deprecated
-        */
-        IMPORT_C void SetItemL( TCommsDbIspType aIspType,
-                                TUint32 aUid,
-                                const TDesC& aName,
-                                TApBearerType aBearerType );
-
-        /**
-        * Sets item values of the access point. Leaves on failure.
-        * @param aIspType The type of the access point
-        * (Internet only, Wap only, Internet AND Wap)
-        * @param aUid The ID of the access point
-        * @param aName The name of the access point
-        * @param aBearerType The bearer type of the access point
-        * @param aStartpage The starting page of the access point
-        *
-        * @deprecated
-        */
-        IMPORT_C void SetItemL( TCommsDbIspType aIspType,
-                                TUint32 aUid,
-                                const TDesC& aName,
-                                TApBearerType aBearerType,
-                                const TDesC& aStartpage
-                                );
-
-
-        /**
-        * Gets the name of the 'current' access point
-        * Ownership of the returned text is not passed.
-        * @return The name of the current access point
-        *
-        * @deprecated
-        */
-        IMPORT_C const TDesC& Name();
-
-
-        /**
-        * Gets the UID of the current access point
-        * @return The UID of the current access point
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 Uid();
-
-
-        /**
-        * Gets the ISP-type of the current access point
-        * @return The ISP-type of the current access point.
-        *
-        * @deprecated
-        */
-        IMPORT_C TCommsDbIspType Type();
-
-
-        /**
-        * Gets the bearer-type of the current access point
-        * @return The bearer-type of the current access point.
-        *
-        * @deprecated
-        */
-        IMPORT_C TApBearerType BearerType();
-
-
-        /**
-        * Returns the startpage of the current access point if any,
-        * otherwise, an empty string is returned.
-        * Ownership of the returned text is not passed.
-        * @return The startpage of the current access point.
-        *
-        * @deprecated
-        */
-        IMPORT_C const TDesC& StartPage() const;
-
-
-        /**
-        * Returns whether the access point is read-only or not.
-        * @return Whether the access point is read-only or not.
-        *
-        * @deprecated
-        */
-        IMPORT_C TBool IsReadOnly() const;
-
-
-        /**
-        * Returnes whether the given access point is a VPN ap or not.
-        * @return whether the given access point is a VPN ap or not.
-        */
-        TBool IsVpnAp() const;
-
-        /**
-        * Sets whether the given access point is a VPN ap or not.
-        */
-        void SetVpnFlag( TBool aIsVpn );
-
-    protected:
-        void CreateExtraL();    ///< Construct the extra data
-
-    private:    // Data
-        TCommsDbIspType iIspType;       ///< The type of the access point
-                                        ///< (Internet only, Wap only,
-                                        ///< Internet AND Wap)
-        TUint32         iUid;           ///< The ID of the access point
-        HBufC*          iName;          ///< The name of the access point
-        HBufC*          iStartPage;     ///< The startpage of the access point
-
-        TApBearerType   iBearerType;    ///< Bearer type of the access point
-        TApListItemExtra*   iExt;       ///< Extra data structure
-
-
-    protected:  // Friend classes
-        friend class CApSelect;
-        friend class TApListItemUidKey;
-
-    };
-
-
-
-#endif      // CAPLISTITEM_H
-
-// End of File
--- a/ipcm_pub/access_point_engine_api/inc/ApNetworkItem.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,162 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declaration of the CApNetworkItem class.
-*
-*/
-
-
-#ifndef CAPNETWORKITEM_H
-#define CAPNETWORKITEM_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
- 
-//  INCLUDES
-#include <commdb.h>
-#include <ApEngineVer.h>
-#include <ApEngineConsts.h>
-
-// CLASS DECLARATION
-/**
-*  Representation of a Network item.
-*/
-NONSHARABLE_CLASS( CApNetworkItem ) :public CBase
-                                         ///< This class is used to hold
-                                         ///< the main information of a
-                                         ///< Network item.
-                                         ///< It is used in CApNetworks.
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack.
-        * @return The constructed CApNetworkItem.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApNetworkItem* NewLC();
-
-
-        /**
-        * Two-phased constructor. Leaves on failure, places instance
-        * on cleanup stack.
-        * @param aItem a pointer to a CApNetworkItem.
-        * @return The constructed CApNetworkItem.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApNetworkItem* NewLC( CApNetworkItem* aItem );
-
-
-        /**
-        * Destructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C virtual ~CApNetworkItem();
-
-
-        /**
-        * Copies the data from another CApNetworkItem
-        * Substitutes the "Assignment operator."
-        * @return No return value.
-        *
-        * @deprecated
-        */
-        IMPORT_C void CopyFromL( const CApNetworkItem& aCopyFrom );
-
-
-    private:      // Constructors
-        /**
-        * C++ default constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C CApNetworkItem();
-
-
-        /**
-        * Second-phase constructor.
-        * @param aUid The UID
-        * @param aName The name
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL( TUint32 aUid,
-                                  const TDesC& aName
-                                  );
-
-
-        /**
-        * Second-phase constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL();
-
-
-    public: // New functions
-
-        /**
-        * Gets the name of the network group
-        * Ownership of the returned text is not passed.
-        * @return The name of the network group
-        *
-        * @deprecated
-        */
-        IMPORT_C const TDesC& Name() const;
-
-
-        /**
-        * Gets the UID of this network group
-        * @return The UID of this network group
-        *
-        * @deprecated
-        */
-        IMPORT_C TUint32 Uid() const;
-
-
-
-        /**
-        * Sets a UID of the network group.
-        * @param aUid a uid to set.
-        *
-        * @deprecated
-        */
-        IMPORT_C void SetUid( TUint32 aUid );
-
-
-        /**
-        * Sets the network name
-        * @param aName The name to set.
-        *
-        * @deprecated
-        */
-        IMPORT_C void SetNameL( const TDesC& aName );
-
-
-    private:    // Data
-        TUint32         iUid;           ///< The ID of the network group
-        HBufC*          iName;          ///< The name of the network group 
-
-    };
-
-
-
-#endif      // CAPNETWORKITEM_H
-
-// End of File
--- a/ipcm_pub/access_point_engine_api/inc/ApNetworkItemlist.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the CApNetworkItemList class.
-*
-*/
-
-
-#ifndef CAPNETWORKITEMLIST_H
-#define CAPNETWORKITEMLIST_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
- 
-//  INCLUDES
-#include <e32base.h>
-#include <ApEngineVer.h>
-
-// FORWARD DECLARATION
-
-class CApNetworkItem;
-
-// CLASS DECLARATION
-/**
-*  A list of CApNetworkItem-s pointers; items are owned.
-*/
-class CApNetworkItemList : public CArrayPtrFlat<CApNetworkItem>
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * C++ default constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C CApNetworkItemList();
-
-        /**
-        * Destructor. Items in the list are destroyed.
-        *
-        * @deprecated
-        */
-        IMPORT_C virtual ~CApNetworkItemList();
-
-    public:  // New methods
-
-        /**
-        * Get pointer to the item having aUid,
-        * or NULL if no such item is in the
-        * list.
-        * @param aUid Uid of item to get.
-        * @return Pointer to the item having uid aUid, or NULL. Ownership
-        * not passed (the list still owns the item).
-        *
-        * @deprecated
-        */
-        IMPORT_C const CApNetworkItem* ItemForUid( TUint32 aUid ) const;
-
-    };
-
-#endif // CAPNETWORKITEMLIST_H
-
-// End of File
--- a/ipcm_pub/access_point_engine_api/inc/Aplistitemlist.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,74 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  Declaration of the CApListItemList class.
-*
-*/
-
-
-#ifndef CAPLISTITEMLIST_H
-#define CAPLISTITEMLIST_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
- 
-//  INCLUDES
-#include <e32base.h>
-#include <ApEngineVer.h>
-
-// FORWARD DECLARATION
-
-class CApListItem;
-
-// CLASS DECLARATION
-/**
-*  A list of CApListItem-s pointers; items are owned.
-*/
-class CApListItemList : public CArrayPtrFlat<CApListItem>
-    {
-    public:  // Constructors and destructor
-
-        /**
-        * C++ default constructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C CApListItemList();
-
-        /**
-        * Destructor. Items in the list are destroyed.
-        *
-        * @deprecated
-        */
-        IMPORT_C virtual ~CApListItemList();
-
-    public:  // New methods
-
-        /**
-        * Get pointer to the item having aUid,
-        * or NULL if no such item is in the
-        * list.
-        * @param aUid Uid of item to get.
-        * @return Pointer to the item having uid aUid, or NULL. Ownership
-        * not passed (the list still owns the item).
-        *
-        * @deprecated
-        */
-        IMPORT_C CApListItem* ItemForUid( TUint32 aUid ) const;
-
-    };
-
-#endif
-
-// End of File
--- a/ipcm_pub/access_point_settings_handler_api/access_point_engine_api.metaxml	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,18 +0,0 @@
-<?xml version="1.0" ?>
-<api id="eab22f6b7dcd5833eaa3a66dcc8bd217" dataversion="1.0">
-  <name>Access Point Engine API</name>
-  <description>Provides applications the possibility to access the Access Point information stored in the communications database.</description>
-  <type>c++</type>
-  <subsystem>networkingutilities</subsystem>
-  <libs>
-    <lib name="apengine.lib" />
-  </libs>
-  <release category="sdk" sinceversion="0.9" deprecatedsince="3.2"/>
-  <attributes>
-     <!-- This indicates wether the api provedes separate html documentation -->
-     <!-- or is the additional documentation generated from headers. -->
-     <!-- If you are unsuere then the value is "no" -->
-     <htmldocprovided>yes</htmldocprovided>
-     <adaptation>no</adaptation>
-  </attributes>
-</api>
--- a/ipcm_pub/access_point_settings_handler_api/group/bld.inf	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-/*
-* Copyright (c) 2006 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description:  File that exports the files belonging to 
-:                Access Point Settings Handler API
-*
-*/
-
-
-#include <platform_paths.hrh>
-
-PRJ_PLATFORMS
-DEFAULT
-
-PRJ_EXPORTS
-
-../inc/ApSettingsHandlerCommons.h     MW_LAYER_PUBLIC_EXPORT_PATH(ApSettingsHandlerCommons.h)
-../inc/Apsettingshandlerui.h     MW_LAYER_PUBLIC_EXPORT_PATH(ApSettingsHandlerUI.h)
--- a/ipcm_pub/access_point_settings_handler_api/inc/ApSettingsHandlerCommons.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,179 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Contains common consts, typedefs for the Access Point settings.
-*
-*/
-
-
-#ifndef APSETTINGS_HANDLER_COMMONS_H
-#define APSETTINGS_HANDLER_COMMONS_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
- 
-// INCLUDES
-#include <ApEngineConsts.h>
-
-
-//#define __TEST_OOMDEBUG
-
-
-// CONSTANTS
-_LIT( KEmpty, "");
-
-_LIT( KTestFileName, "C:\\Data\\ApSetUiTest\\TestState.txt" );
-
-const TInt  KApSelectionCanceled    = -350;
-const TInt  KTxtNotOverriden        = -351;
-const TInt  KErrInvalidTextId       = -355;
-
-#ifdef __TEST_OOMDEBUG
-    const TInt  KDialogListTest      = 1;   // Done
-    const TInt  KPopupListTest       = 2;   // Done
-    const TInt  KQueryTest           = 3;   // Done
-    const TInt  KEditingTest         = 4;   // Done
-    const TInt  KViewerTest          = 5;   // impl.
-    const TInt  KCreateBlankTest     = 6;   // Impl
-    const TInt  KCreateUseExistTest  = 7;   // Impl
-    const TInt  KDeleteTest          = 8;   // N/I!
-
-    const TUint32   KOOMRetryCount   = 10;
-    const TUint32   KOOMRetryOffset  = 5;
-#endif // __TEST_OOMDEBUG
-
-// DATA TYPES
-enum TTextID    /// These enums are used to identify the 'overridable' 
-                /// text items in CApSettingsHandler.
-    {
-    EApSettingsSelStatusPaneText = 0x00,
-    EApSettingsSelListEmptyText,
-    EPopupPromptText            /// Only this last one is used & implemented.
-    };
-
-
-enum TTransactionResult         ///< Transaction results
-    {
-    EOwnTransaction,            ///< Own transaction started
-    EUsingAlreadyStarted,       ///< Used already started one
-    EFailedWithLocked           ///< Transaction start failed with KErrLocked
-    };
-
-
-enum TApUiExitReason
-    {
-    EExitNone,
-    EExit,
-    EShutDown
-    };
-
-
-// CONSTANTS
-const TInt  KTTextIdMin             =  EApSettingsSelStatusPaneText;
-const TInt  KTTextIdMax             =  EPopupPromptText;
-
-const TInt  KMaxNumOfLockedDbRetries= 3;
-
-/// Ui return code flags. They indicate what has happened inside the module. 
-/// They can be combined.
-/**
-* Ui return code flags. They indicate what has happened inside the module. 
-* They can be combined. The most important one is KApUiEventSelected and it 
-* indicates that the user selected an access point (in case of selection...)
-*/
-const TInt  KApUiEventNone              = 0x00000000;   ///< Nothign happend
-const TInt  KApUiEventSelected          = 0x00000001;   ///< Item was selected
-const TInt  KApUiEventCreatedBlank      = 0x00000002;   ///< New item created 
-                                                        ///< from blank
-const TInt  KApUiEventCreatedUsedOld    = 0x00000004;   ///< New item created 
-                                                        ///< from an existing 
-                                                        ///< one
-const TInt  KApUiEventEdited            = 0x00000008;   ///< Item edited
-const TInt  KApUiEventDeleted           = 0x00000010;   ///< Item deleted
-const TInt  KApUiEventExitRequested     = 0x00000020;   ///< User choosed Exit
-const TInt  KApUiEventShutDownRequested = 0x00000040;   ///< System shutdown
-
-// INTERNAL flag
-const TUint32  KApUiEventInternal       = 0x80000000;   ///< Internal flag
-
-
-const TUint32  KApNoneUID               = 0x00000000;
-
-
-enum TSelectionListType         ///< Defines the list type to be used
-    {
-    EApSettingsSelListIsPopUp, 
-    EApSettingsSelListIsListPane,
-    EApSettingsSelListIsPopUpWithNone
-    };
-
-
-enum TSelectionMenuType         ///< Defines the Options menu type to be used
-    {
-    EApSettingsSelMenuNormal, 
-    EApSettingsSelMenuSelectOnly,
-    EApSettingsSelMenuSelectNormal
-    };
-
-
-
-enum TApSettingsHandlerUiPanicCodes ///< Defines the Panic codes
-    {
-    EMenuCommandUnknown,            ///< Unknonw menu command
-    EInvalidDbType,                 ///< Invalid database type
-    EInvalidBitmapType,             ///< Invalid bitmap type
-    EInvalidBearerType,             ///< Invalid bearer type
-    EInvalidIspRequest,             ///< Invalid ISP request
-    ENullPointer,                   ///< Null pointer passed
-    EUnknownCase,                   ///< Unknown 'case' 
-    EInvalidTextType,               ///< Invalid text type
-    EInvalidState                   ///< Invalid state
-    } ;
-
-
-
-/**
-* Panic
-* @param aPanic Panic code
-*/
-void Panic( TApSettingsHandlerUiPanicCodes aPanic );
-
-
-/**
-* Ask a query
-* @param aResId Resource id
-* @param aVar variable part of the query, if any
-* @return The result of the query
-*/
-TInt AskQueryL( TInt aResId, TDesC* aVar = NULL );
-
-
-/**
-* Shows a note
-* @param aResId Resource id
-* @param aVar variable part of the note, if any
-* @return The result of the note
-*/
-TInt ShowNoteL( TInt aResId, TDesC* aVar = NULL );
-
-
-#ifdef __TEST_OOMDEBUG
-    TInt GetTestState();
-#endif // __TEST_OOMDEBUG
-
-#endif
-
-
-// End of File
--- a/ipcm_pub/access_point_settings_handler_api/inc/Apsettingshandlerui.h	Wed Oct 27 17:43:56 2010 +0300
+++ /dev/null	Thu Jan 01 00:00:00 1970 +0000
@@ -1,1365 +0,0 @@
-/*
-* Copyright (c) 2002 Nokia Corporation and/or its subsidiary(-ies). 
-* All rights reserved.
-* This component and the accompanying materials are made available
-* under the terms of "Eclipse Public License v1.0"
-* which accompanies this distribution, and is available
-* at the URL "http://www.eclipse.org/legal/epl-v10.html".
-*
-* Initial Contributors:
-* Nokia Corporation - initial contribution.
-*
-* Contributors:
-*
-* Description: 
-*     Declares the main handler, CApSettingsHandler and public API for the 
-*     Access Point settings.
-*
-*/
-
-
-#ifndef APSETTINGS_HANDLER_H
-#define APSETTINGS_HANDLER_H
-
-// Deprecation warning
-#warning This header file has been deprecated and will be fully removed between weeks 12 and 18 of 2010. See Polonium CR #153 for details.
- 
- 
-// INCLUDES
-#include <ApSettingsHandlerCommons.h>
-#include <ApEngineConsts.h>
-#include <ApSelect.h>
-
-// CONSTANTS
-const   TUid    KUidApSettingsHandler = { 0x10008d3B };
-
-typedef struct      ///< Extra data holder
-    {
-        TInt                iResOffset;
-        TBool               iIsIpv6Supported;       // Default is NO 
-        TBool               iIsFeatureManagerInitialised;
-        TInt                iExtra;
-        TInt                iSortType;
-        TVpnFilterType      iVpnFilterType;
-        TInt                iVariant;               /// Local variant value
-        TBool               iIncludeEasyWlan;
-    }TApSetHandlerExtra;
-
-// FORWARD DECLARATIONS
-class CActiveApDb;
-class CApSelector;
-class CApSettingsModel;
-class CApSettings;
-class CTextOverrides;
-class CApAccessPointItem;
-
-class CApSettingsHandlerImpl;
-
-// CLASS DECLARATION
-/**
-* CApSettingsHandler class: It is the main handler for the Access Point 
-* settings. It contains the only public API for other (sub)systems.
-*
-*/
-class CApSettingsHandler : public CBase
-    {
-
-    public: // Constructors and destructor
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object. It is customizable through 
-        * the parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create access 
-        * points. It has two main parts, Select and Edit. The first parameter,
-        * aStartWithSelection gives whether we would like to select or edit.
-        * In case of selection, there is the possibility to use this module in
-        * many applications. For this, two layouts are implemented, 
-        * one is list pane used by General Settings which provides the list in
-        * a list-pane. The other layout is for the other applications 
-        * requiring access point selection, a popup-list style as the decision
-        * I know about was that General Settings will use list-pane and all
-        * other apps. popup-list style. It is the caller who selects the style
-        * so if spec. says otherwise, this module still can be used.
-        * It is also possible to start the UI without selection, so if any 
-        * module has a 'linked/default/etc.' access point and stored it's UID,
-        * the module can simply call the editor part of the UI without having
-        * to select the AP once more. In case of editing only, 
-        * (aStartWithSelection is EFalse), all other construction parameters 
-        * are ignored and after construction caller can simply call 
-        * RunSettingsL(..). In case of selection, a lot of other parameters 
-        * can be specified to fulfil all requirements. There are three types 
-        * of Options menu available: 
-        * EApSettingsSelMenuNormal, 
-        * EApSettingsSelMenuSelectOnly,
-        * EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly: Only Select is visible, 
-        *                               no way to edit, delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:    Options menu specified in General 
-        *                               Settings, contains Edit, Delete, 
-        *                               Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal: Same as in EApSettingsSelMenuNormal
-        *                                BUT the first item is Select. 
-        *                                This one makes it possible to select 
-        *                                an access point and also possible to 
-        *                                edit, create, delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering 
-        * criteria for the selection list creation. First, it is possible to
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly:  Filter allows only access points that are
-        *                           capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly:       Filter allows only access points that are 
-        *                           capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP: Filter allows only access points that are
-        *                           capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory:  Filter allows only access points that are
-        *                           capable of WAP access AND contain 
-        *                           mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll:           No filtering is done for the isp-type,
-        *                           all types of access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together 
-        * the values, filtering will be done in such a way that only access 
-        * points with the listed ISP-types will be shown. Second filtering
-        * possibility (aBearerFilter) is the desired bearer type. The possible
-        * values are the values of the TApBearerType enum type and their 
-        * combinations, as in case of the ISP type. The ordering of the list
-        * can be specified with the aSortType parameter. It can have the
-        * following values:
-        * KEApSortUidAscending:     The sorting is done according to the ID 
-        *                           of the access points in ascending order.
-        * KEApSortUidDescending:    The sorting is done according to the ID 
-        *                           of the access points in descending order.
-        * KEApSortNameAscending:    The sorting is done according to the name
-        *                           of the access points in ascending order.
-        * KEApSortNameDescending:   The sorting is done according to the name
-        *                           of the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aStartWithSelection    A boolean value indicating whether to 
-        *                               select or edit an ap.
-        * @param aListType      A TSelectionListType enum indicating the 
-        *                       desired list type.
-        * @param aSelMenuType   A TSelectionMenuType enum indicating the 
-        *                       desired menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @return The constructed CApSettingsHandler object.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApSettingsHandler* NewLC(
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType
-                        );
-
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object. It is customizable through 
-        * the parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create 
-        * access points. It has two main parts, Select and Edit. The first 
-        * parameter, aStartWithSelection gives whether we would like to select
-        * or edit. In case of selection, there is the possibility to use this 
-        * module in many applications. For this, two layouts are implemented,
-        * one is list pane used by General Settings which provides the list 
-        * in a list-pane. The other layout is for the other applications 
-        * requiring access point selection, a popup-list style as the 
-        * decision I know about was that General Settings will use list-pane 
-        * and all other apps. popup-list style. It is the caller who selects 
-        * the style so if spec. says otherwise, this module still can be used.
-        * It is also possible to start the UI without selection, so if any 
-        * module has a 'linked/default/etc.' access point and stored it's UID,
-        * the module can simply call the editor part of the UI without having
-        * to select the AP once more.
-        * In case of editing only, (aStartWithSelection is EFalse), all other 
-        * construction parameters are ignored and after construction caller 
-        * can simply call RunSettingsL(..).
-        * In case of selection, a lot of other parameters can be specified 
-        * to fulfil all requirements. There are three types of Options menu 
-        * available: 
-        * EApSettingsSelMenuNormal, 
-        * EApSettingsSelMenuSelectOnly,
-        * EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly:     Only Select is visible, no way to
-        *                                   edit, delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:        Options menu specified in General 
-        *                                   Settings, contains Edit, Delete, 
-        *                                   Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal:  Same as in EApSettingsSelMenuNormal
-        *                                   BUT the first item is Select. 
-        *                                   This one makes it possible to 
-        *                                   select an access point and also 
-        *                                   possible to edit, create, 
-        *                                   delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering 
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly:      Filter allows only access points that
-        *                               are capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly:           Filter allows only access points that 
-        *                               are capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP:    Filter allows only access points that
-        *                               are capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory:      Filter allows only access points that
-        *                               are capable of WAP access AND contain
-        *                               mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll:               No filtering is done for the isp-type,
-        *                               all types of access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the
-        * values, filtering will be done in such a way that only access points
-        * with the listed ISP-types will be shown.
-        * Second filtering possibility (aBearerFilter) is the desired bearer 
-        * type. The possible values are the values of the TApBearerType enum 
-        * type and their combinations, as in case of the ISP type.
-        * The ordering of the list can be specified with the aSortType 
-        * parameter. It can have the following values:
-        * KEApSortUidAscending:     The sorting is done according to the ID
-        *                           of the access points in ascending order.
-        * KEApSortUidDescending:    The sorting is done according to the ID 
-        *                           of the access points in descending order.
-        * KEApSortNameAscending:    The sorting is done according to the name 
-        *                           of the access points in ascending order.
-        * KEApSortNameDescending:   The sorting is done according to the name
-        *                           of the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aDb A database to work on
-        * @param aStartWithSelection A boolean value indicating whether to 
-        * select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        * list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        * menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @return The constructed CApSettingsHandler object.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApSettingsHandler* NewLC(
-                        CActiveApDb& aDb,
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType
-                        );
-
-
-
-
-
-
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object.It is customizable through the
-        * parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create access 
-        * points. It has two main parts, Select and Edit. The first parameter, 
-        * aStartWithSelection gives whether we would like to select or edit.
-        * In case of selection, there is the possibility to use this module in
-        * many applications. For this, two layouts are implemented, one is 
-        * list pane used by General Settings which provides the list in a 
-        * list-pane. The other layout is for the other applications requiring 
-        * access point selection, a popup-list style as the decision was that 
-        * General Settings will use list-pane and all other apps. popup-list 
-        * style. It is the caller who selects the style so if spec. says 
-        * otherwise, this module still can be used.
-        * It is also possible to start the UI without selection, so if any 
-        * module has a 'linked/default/etc.' access point and stored it's UID,
-        * the module can simply call the editor part of the UI without having
-        * to select the AP once more.
-        * In case of editing only, (aStartWithSelection is EFalse), all other 
-        * construction parameters are ignored and after construction caller 
-        * can simply call RunSettingsL(..).
-        * In case of selection, a lot of other parameters can be specified to
-        * fulfil all requirements. There are three types of Options menu 
-        * available: EApSettingsSelMenuNormal, EApSettingsSelMenuSelectOnly,
-        * EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly: Only Select is visible, no way to edit,
-        *   delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:Options menu specified in General Settings,
-        *   contains Edit, Delete, Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal: Same as in EApSettingsSelMenuNormal 
-        *   BUT the first item is Select. This one makes it possible to select 
-        *   an access point and also possible to edit, create, delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering 
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly: Filter allows only access points that are 
-        *   capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly: Filter allows only access points that are 
-        *   capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP: Filter allows only access points that are 
-        *   capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory: Filter allows only access points that are 
-        *   capable of WAP access AND contain mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll: No filtering is done for the isp-type, all types of
-        *   access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the 
-        * values, filtering will be done in such a way that only access points 
-        * with the listed ISP-types will be shown.
-        * Second filtering possibility (aBearerFilter) is the desired bearer 
-        * type. The possible values are the values of the TApBearerType enum 
-        * type and their combinations, as in case of the ISP type.
-        * The ordering of the list can be specified with the aSortType 
-        * parameter. It can have the following values:
-        * KEApSortUidAscending: The sorting is done according to the ID of 
-        *   the access points in ascending order.
-        * KEApSortUidDescending: The sorting is done according to the ID of 
-        *   the access points in descending order.
-        * KEApSortNameAscending: The sorting is done according to the name of 
-        *   the access points in ascending order.
-        * KEApSortNameDescending: The sorting is done according to the name of 
-        *   the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @return The constructed CApSettingsHandler object.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApSettingsHandler* NewLC(
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType,
-                        TInt aReqIpvType
-                        );
-
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object. It is customizable through 
-        * the parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create access 
-        * points. It has two main parts, Select and Edit. The first parameter,
-        * aStartWithSelection gives whether we would like to select or edit.
-        * In case of selection, there is the possibility to use this module in
-        * many applications. For this, two layouts are implemented, one is list
-        * pane used by General Settings which provides the list in a list-pane.
-        * The other layout is for the other applications requiring access point
-        * selection, a popup-list style as the decision was that General 
-        * Settings will use list-pane and all other apps. popup-list style. 
-        * It is the caller who selects the style so if spec. says otherwise,
-        * this module still can be used. It is also possible to start the UI 
-        * without selection, so if any module has a 'linked/default/etc.'
-        * access point and stored it's UID, the module can simply call the 
-        * editor part of the UI without having to select the AP once more.
-        * In case of editing only, (aStartWithSelection is EFalse), all other 
-        * construction parameters are ignored and after construction caller can
-        * simply call RunSettingsL(..). In case of selection, a lot of other
-        * parameters can be specified to fulfil all requirements. There are 
-        * three types of Options menu available: EApSettingsSelMenuNormal, 
-        * EApSettingsSelMenuSelectOnly, EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly: Only Select is visible, no way to edit,
-        *   delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:Options menu specified in General Settings,
-        *   contains Edit, Delete, Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal: Same as in EApSettingsSelMenuNormal 
-        *   BUT the first item is Select. This one makes it possible to select
-        *   an access point and also possible to edit, create, delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly: Filter allows only access points that are 
-        *   capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly: Filter allows only access points that are 
-        *   capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP: Filter allows only access points that are 
-        *   capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory: Filter allows only access points that are 
-        *   capable of WAP access AND contain mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll: No filtering is done for the isp-type, all types of
-        *   access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the
-        * values, filtering will be done in such a way that only access points
-        * with the listed ISP-types will be shown. Second filtering possibility
-        * (aBearerFilter) is the desired bearer type. The possible values are 
-        * the values of the TApBearerType enum type and their combinations, as
-        * in case of the ISP type. The ordering of the list can be specified 
-        * with the aSortType parameter. It can have the following values:
-        * KEApSortUidAscending: The sorting is done according to the ID of 
-        *   the access points in ascending order.
-        * KEApSortUidDescending: The sorting is done according to the ID of 
-        *   the access points in descending order.
-        * KEApSortNameAscending: The sorting is done according to the name of
-        *   the access points in ascending order.
-        * KEApSortNameDescending: The sorting is done according to the name of
-        *   the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aDb A database to work on
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @return The constructed CApSettingsHandler object.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApSettingsHandler* NewLC(
-                        CActiveApDb& aDb,
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType,
-                        TInt aReqIpvType
-                        );
-
-
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object.It is customizable through the
-        * parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create access 
-        * points. It has two main parts, Select and Edit. The first parameter, 
-        * aStartWithSelection gives whether we would like to select or edit.
-        * In case of selection, there is the possibility to use this module in
-        * many applications. For this, two layouts are implemented, one is 
-        * list pane used by General Settings which provides the list in a 
-        * list-pane. The other layout is for the other applications requiring 
-        * access point selection, a popup-list style as the decision was that 
-        * General Settings will use list-pane and all other apps. popup-list 
-        * style. It is the caller who selects the style so if spec. says 
-        * otherwise, this module still can be used.
-        * It is also possible to start the UI without selection, so if any 
-        * module has a 'linked/default/etc.' access point and stored it's UID,
-        * the module can simply call the editor part of the UI without having
-        * to select the AP once more.
-        * In case of editing only, (aStartWithSelection is EFalse), all other 
-        * construction parameters are ignored and after construction caller 
-        * can simply call RunSettingsL(..).
-        * In case of selection, a lot of other parameters can be specified to
-        * fulfil all requirements. There are three types of Options menu 
-        * available: EApSettingsSelMenuNormal, EApSettingsSelMenuSelectOnly,
-        * EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly: Only Select is visible, no way to edit,
-        *   delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:Options menu specified in General Settings,
-        *   contains Edit, Delete, Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal: Same as in EApSettingsSelMenuNormal 
-        *   BUT the first item is Select. This one makes it possible to select 
-        *   an access point and also possible to edit, create, delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering 
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly: Filter allows only access points that are 
-        *   capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly: Filter allows only access points that are 
-        *   capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP: Filter allows only access points that are 
-        *   capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory: Filter allows only access points that are 
-        *   capable of WAP access AND contain mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll: No filtering is done for the isp-type, all types of
-        *   access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the 
-        * values, filtering will be done in such a way that only access points 
-        * with the listed ISP-types will be shown.
-        * Second filtering possibility (aBearerFilter) is the desired bearer 
-        * type. The possible values are the values of the TApBearerType enum 
-        * type and their combinations, as in case of the ISP type.
-        * The ordering of the list can be specified with the aSortType 
-        * parameter. It can have the following values:
-        * KEApSortUidAscending: The sorting is done according to the ID of 
-        *   the access points in ascending order.
-        * KEApSortUidDescending: The sorting is done according to the ID of 
-        *   the access points in descending order.
-        * KEApSortNameAscending: The sorting is done according to the name of 
-        *   the access points in ascending order.
-        * KEApSortNameDescending: The sorting is done according to the name of 
-        *   the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        * @return The constructed CApSettingsHandler object.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApSettingsHandler* NewLC(
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType,
-                        TInt aReqIpvType,
-                        TVpnFilterType aVpnFilterType
-                        );
-
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object. It is customizable through 
-        * the parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create access 
-        * points. It has two main parts, Select and Edit. The first parameter,
-        * aStartWithSelection gives whether we would like to select or edit.
-        * In case of selection, there is the possibility to use this module in
-        * many applications. For this, two layouts are implemented, one is list
-        * pane used by General Settings which provides the list in a list-pane.
-        * The other layout is for the other applications requiring access point
-        * selection, a popup-list style as the decision was that General 
-        * Settings will use list-pane and all other apps. popup-list style. 
-        * It is the caller who selects the style so if spec. says otherwise,
-        * this module still can be used. It is also possible to start the UI 
-        * without selection, so if any module has a 'linked/default/etc.'
-        * access point and stored it's UID, the module can simply call the 
-        * editor part of the UI without having to select the AP once more.
-        * In case of editing only, (aStartWithSelection is EFalse), all other 
-        * construction parameters are ignored and after construction caller can
-        * simply call RunSettingsL(..). In case of selection, a lot of other
-        * parameters can be specified to fulfil all requirements. There are 
-        * three types of Options menu available: EApSettingsSelMenuNormal, 
-        * EApSettingsSelMenuSelectOnly, EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly: Only Select is visible, no way to edit,
-        *   delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:Options menu specified in General Settings,
-        *   contains Edit, Delete, Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal: Same as in EApSettingsSelMenuNormal 
-        *   BUT the first item is Select. This one makes it possible to select
-        *   an access point and also possible to edit, create, delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly: Filter allows only access points that are 
-        *   capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly: Filter allows only access points that are 
-        *   capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP: Filter allows only access points that are 
-        *   capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory: Filter allows only access points that are 
-        *   capable of WAP access AND contain mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll: No filtering is done for the isp-type, all types of
-        *   access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the
-        * values, filtering will be done in such a way that only access points
-        * with the listed ISP-types will be shown. Second filtering possibility
-        * (aBearerFilter) is the desired bearer type. The possible values are 
-        * the values of the TApBearerType enum type and their combinations, as
-        * in case of the ISP type. The ordering of the list can be specified 
-        * with the aSortType parameter. It can have the following values:
-        * KEApSortUidAscending: The sorting is done according to the ID of 
-        *   the access points in ascending order.
-        * KEApSortUidDescending: The sorting is done according to the ID of 
-        *   the access points in descending order.
-        * KEApSortNameAscending: The sorting is done according to the name of
-        *   the access points in ascending order.
-        * KEApSortNameDescending: The sorting is done according to the name of
-        *   the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aDb A database to work on
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        * @return The constructed CApSettingsHandler object.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApSettingsHandler* NewLC(
-                        CActiveApDb& aDb,
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType,
-                        TInt aReqIpvType,
-                        TVpnFilterType aVpnFilterType
-                        );
-
-
-
-
-
-        /**
-        * Two-phased constructor. Leaves on failure.
-        * This function shall be used to create the access point 
-        * settings/selection handling UI object. It is customizable through 
-        * the parameters. This object is a small layer above the UI part and
-        * it provides a standard interface to select, edit, create access 
-        * points. It has two main parts, Select and Edit. The first parameter,
-        * aStartWithSelection gives whether we would like to select or edit.
-        * In case of selection, there is the possibility to use this module in
-        * many applications. For this, two layouts are implemented, one is list
-        * pane used by General Settings which provides the list in a list-pane.
-        * The other layout is for the other applications requiring access point
-        * selection, a popup-list style as the decision was that General 
-        * Settings will use list-pane and all other apps. popup-list style. 
-        * It is the caller who selects the style so if spec. says otherwise,
-        * this module still can be used. It is also possible to start the UI 
-        * without selection, so if any module has a 'linked/default/etc.'
-        * access point and stored it's UID, the module can simply call the 
-        * editor part of the UI without having to select the AP once more.
-        * In case of editing only, (aStartWithSelection is EFalse), all other 
-        * construction parameters are ignored and after construction caller can
-        * simply call RunSettingsL(..). In case of selection, a lot of other
-        * parameters can be specified to fulfil all requirements. There are 
-        * three types of Options menu available: EApSettingsSelMenuNormal, 
-        * EApSettingsSelMenuSelectOnly, EApSettingsSelMenuSelectNormal.
-        * <br>
-        *-EApSettingsSelMenuSelectOnly: Only Select is visible, no way to edit,
-        *   delete, create, etc.
-        * <br>
-        * -EApSettingsSelMenuNormal:Options menu specified in General Settings,
-        *   contains Edit, Delete, Create new, etc. menu items.
-        * <br>
-        * -EApSettingsSelMenuSelectNormal: Same as in EApSettingsSelMenuNormal 
-        *   BUT the first item is Select. This one makes it possible to select
-        *   an access point and also possible to edit, create, delete, etc.
-        * <br>
-        * The following three parameters specify the filtering and ordering
-        * criteria for the selection list creation. First, it is possible to 
-        * specify which ISP-type we are looking for. The possible values are:
-        * <br>
-        * KEApIspTypeInternetOnly: Filter allows only access points that are 
-        *   capable of only internet access.
-        * <br>
-        * KEApIspTypeWAPOnly: Filter allows only access points that are 
-        *   capable of only WAP access.
-        * <br>
-        * KEApIspTypeInternetAndWAP: Filter allows only access points that are 
-        *   capable of internet AND WAP access.
-        * <br>
-        * KEApIspTypeWAPMandatory: Filter allows only access points that are 
-        *   capable of WAP access AND contain mandatory WAP settings.
-        * <br>
-        * KEApIspTypeAll: No filtering is done for the isp-type, all types of
-        *   access points are shown.
-        * <br>
-        * It is possible to combine them by simply adding/or-ing together the
-        * values, filtering will be done in such a way that only access points
-        * with the listed ISP-types will be shown. Second filtering possibility
-        * (aBearerFilter) is the desired bearer type. The possible values are 
-        * the values of the TApBearerType enum type and their combinations, as
-        * in case of the ISP type. The ordering of the list can be specified 
-        * with the aSortType parameter. It can have the following values:
-        * KEApSortUidAscending: The sorting is done according to the ID of 
-        *   the access points in ascending order.
-        * KEApSortUidDescending: The sorting is done according to the ID of 
-        *   the access points in descending order.
-        * KEApSortNameAscending: The sorting is done according to the name of
-        *   the access points in ascending order.
-        * KEApSortNameDescending: The sorting is done according to the name of
-        *   the access points in descending order.
-        * Caution! The ordering values can not be combined!
-        * @param aDb A database to work on
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aReqIpvType Specifies whether the caller would like to 
-        *   have IPv4, IPv6 or both access points. If it is IPv6 or Both, 
-        *   in case of IPv6 support is available as a feature, it will be 
-        *   supported. If IPv6 feature is not supported by the phone, it 
-        *   simply defaults to the normal IPv4 version.
-        *   If it is IPv4, it uses the default IPv4 version independently 
-        *   from IPv6 feature beeing available or not.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        * @param aIncludeEasyWlan a TBool indicating whether it should 
-        *   include the easy wlan AP in the list or not.
-        * @return The constructed CApSettingsHandler object.
-        *
-        * @deprecated
-        */
-        IMPORT_C static CApSettingsHandler* NewLC(
-                        CActiveApDb& aDb,
-                        TBool aStartWithSelection,
-                        TSelectionListType aListType,
-                        TSelectionMenuType aSelMenuType,
-                        TInt aIspFilter,
-                        TInt aBearerFilter,
-                        TInt aSortType,
-                        TInt aReqIpvType,
-                        TVpnFilterType aVpnFilterType,
-                        TBool aIncludeEasyWlan
-                        );
-
-
-
-
-        /**
-        * Destructor.
-        *
-        * @deprecated
-        */
-        IMPORT_C ~CApSettingsHandler();
-
-
-    protected:
-        /**
-        * Constructor.
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        *
-        * @deprecated
-        */
-        IMPORT_C CApSettingsHandler(
-                                    TBool aStartWithSelection,
-                                    TSelectionListType aListType,
-                                    TSelectionMenuType aSelMenuType
-                                    );
-
-        /**
-        * Constructor.
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aHelpMajor Major help ID
-        *
-        * @deprecated
-        */
-        IMPORT_C CApSettingsHandler(
-                                    TBool aStartWithSelection,
-                                    TSelectionListType aListType,
-                                    TSelectionMenuType aSelMenuType,
-                                    TUid aHelpMajor
-                                    );
-
-
-        /**
-        * Constructor.
-        * @param aStartWithSelection A boolean value indicating whether to 
-        *   select or edit an ap.
-        * @param aListType A TSelectionListType enum indicating the desired
-        *   list type.
-        * @param aSelMenuType A TSelectionMenuType enum indicating the desired
-        *   menu type.
-        * @param aNeedIpv6Support Whether IPv6 is supported or not
-        */
-        CApSettingsHandler(
-                            TBool aStartWithSelection,
-                            TSelectionListType aListType,
-                            TSelectionMenuType aSelMenuType,
-                            TBool aNeedIpv6Support
-                            );
-
-
-
-        /**
-        * Second-phase constructor.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL(
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType
-                                );
-
-
-        /**
-        * Second-phase constructor.
-        * @param aDb A database to work on
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL(
-                                CActiveApDb& aDb,
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType
-                                );
-
-
-        /**
-        * Second-phase constructor.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL(
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType,
-                                TVpnFilterType aVpnFilterType
-                                );
-
-
-        /**
-        * Second-phase constructor.
-        * @param aDb A database to work on
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL(
-                                CActiveApDb& aDb,
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType,
-                                TVpnFilterType aVpnFilterType
-                                );
-
-
-
-
-        /**
-        * Second-phase constructor.
-        * @param aDb A database to work on
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        * @param aIncludeEasyWlan a TBool indicating whether it should 
-        *   include the easy wlan AP in the list or not.
-        *
-        * @deprecated
-        */
-        IMPORT_C void ConstructL(
-                                CActiveApDb& aDb,
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType,
-                                TVpnFilterType aVpnFilterType,
-                                TBool aIncludeEasyWlan
-                                );
-
-
-    public: // New functions
-        /**
-        * Sets the filtering used in the access point selection.
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @return No return value. Leaves on error.
-        *
-        * @deprecated
-        */
-        IMPORT_C void SetFilterL(
-                                TInt aIspFilter,
-                                TInt aBearerFilter,
-                                TInt aSortType
-                                );
-
-
-        /**
-        * Sets possible overrides of some texts.
-        * By default, text is read from resources. This provides a way to 
-        * change some of the text to a caller-supplied one. The text must 
-        * be read from resource and must be already localized.
-        * More than one text can be substituted, they are stored internally
-        * in an array.
-        * Currently not supported and supporting it is under discussion.
-        * @param aText2Change TTextID to identify the text to be replaced with
-        * @param aNewText Reference to the substitute text.
-        *
-        * @deprecated
-        */
-        IMPORT_C void SetTextOverrideL( TTextID aText2Change, 
-                                        const TDesC& aNewText );
-
-
-        /**
-        * Gets possible overrides of a text.
-        * By default, text is read from resources. This provides a way to 
-        * change some of the text to a caller-supplied one. The text must
-        * be read from resource and must be already localized.
-        * More than one text can be substituted, they are stored internally
-        * in an array.
-        * Currently not supported and supporting it is under discussion
-        * @param aTextID TTextID type to identify the text to be replaced with
-        * @return Reference to the substitute text.
-        *
-        * @deprecated
-        */
-        IMPORT_C const TDesC& TextOverrideL( TTextID aTextId );
-
-
-        /**
-        * Starts the settings component.
-        * Creates dialog(s) from scratch, launches and executes them.
-        * Can leave with error codes.
-        * @param TUint32 aHighlight The UID of the AP to highlight by default
-        * @param TUint32 aSelected The UID of the access point selected 
-        * by the user.
-        * @return The accomplished task's flag-codes:
-        * <br>
-        * KApUiEventNone,
-        * <br>
-        * KApUiEventSelected,
-        * <br>
-        * KApUiEventCreatedBlank,
-        * <br>
-        * KApUiEventCreatedUsedOld,
-        * <br>
-        * KApUiEventEdited,
-        * <br>
-        * KApUiEventDeleted,
-        * <br>
-        * KApUiEventExitRequested
-        * <br>and their combinations. ( Bitwise OR )
-        * <br>
-        * aSelected will be modified only if KApUiEventSelected is included 
-        * in the flags.
-        * <br>
-        * In case it returns KApUiEventExitRequested, the user had choosen
-        * the Exit option from the Options menu which means
-        * that the caller application MUST exit!
-        * <br>
-        * Returns after completion!
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt RunSettingsL( TUint32 aHighLight, TUint32& aSelected );
-
-
-        /**
-        * Component Validation Test.
-        * @return KErrNone.
-        *
-        * @deprecated
-        */
-        IMPORT_C static TInt Cvt();
-
-
-    protected:  // New functions
-        /**
-        * @Deprecated
-        * Starts the settings component.
-        * Creates dialog(s) from scratch, launches and executes them.
-        * In case of error, leaves with error codes.
-        * @param TUint32 aHighlight The UID of the AP to highlight by default
-        * @param TUint32 aSelected The UID of the AP selected by the user
-        * @return The accomplished task's flag-codes:
-        * <br>
-        * KApUiEventNone,
-        * <br>
-        * KApUiEventSelected,
-        * <br>
-        * KApUiEventCreatedBlank,
-        * <br>
-        * KApUiEventCreatedUsedOld,
-        * <br>
-        * KApUiEventEdited,
-        * <br>
-        * KApUiEventDeleted
-        * <br>
-        * and their combinations. ( Bitwise OR )
-        * <br>
-        * aSelected will be modified only if KApUiEventSelected is included 
-        * in the flags.
-        * <br>
-        * Returns after completion!
-        */
-        TInt DoRunSettingsL( TUint32 aHighLight, TUint32& aSelected );
-
-
-        /**
-        * Starts the viewer component.
-        * Creates dialog(s) from scratch, launches and executes it.
-        * In case of error, leaves with error codes.
-        * @param TUint32 aUid The UID of the AP to view/edit
-        * @return Returns the completed task's flags
-        * KApUiEventNone, KApUiEventSelected, KApUiEventCreatedBlank,
-        * KApUiEventCreatedUsedOld, KApUiEventEdited, KApUiEventDeleted,
-        * KApUiEventExitRequested and their combinations. ( Bitwise OR )
-        * In case it returns KApUiEventExitRequested, the user had choosen
-        * the Exit option from the Options menu which means
-        * that the caller application MUST exit!
-        * <br>
-        * Returns after completion!
-        *
-        * @deprecated
-        */
-        IMPORT_C TInt RunViewerL( TUint32 aUid );
-
-
-        /**
-        * @Deprecated
-        * Starts the viewer component.
-        * Creates dialog(s) from scratch, launches and executes it.
-        * In case of error, leaves with error codes.
-        * @param TUint32 aUid The UID of the AP to view/edit
-        * @return Returns the completed task's flags
-        * KApUiEventNone, KApUiEventSelected, KApUiEventCreatedBlank,
-        * KApUiEventCreatedUsedOld, KApUiEventEdited, KApUiEventDeleted,
-        * KApUiEventExitRequested and their combinations. ( Bitwise OR )
-        * Returns after completion!
-        */
-        TInt DoRunViewerL( TUint32 aUid );
-
-
-        // handles the Delete access Point command.
-        // @Deprecated
-        void HandleApDeleteCmdL( TUint32 aUid, TBool aIsLast );
-
-
-        // handles the Create blank new access Point command.
-        // @Deprecated
-        TUint32 HandleApBlankNewL( TInt aBearers, TInt aIsps );
-
-
-        // handles the Create new access Point by using existing one command.
-        // @Deprecated
-        TUint32 HandleApUseOldNewL();
-
-
-        // handles the Editing of the newly created access Point.
-        // @Deprecated
-        TUint32 EditAfterCreateL( TUint32 aUid, 
-                                  CApAccessPointItem* aItem = NULL );
-
-
-        /**
-        * Second-phase internal constructor.
-        * @param aDb A database to work on
-        * @param aIspTypeFilter Filtering criteria on ISP type
-        * @param aBearerFilter Filtering criteria on bearer type
-        * @param aSortType Specifies the sort order to use.
-        * @param aVpnFilterType a TVpnFilterType representing the possible 
-        *   additional VPN filtering.
-        * @param aIncludeEasyWlan a TBool indicating whether it should 
-        *   include the easy wlan AP in the list or not.
-        */
-        void DoConstructL( CActiveApDb* aDb, TInt aIspFilter,
-                           TInt aBearerFilter, TInt aSortType,
-                           TVpnFilterType aVpnFilterType,
-                           TBool aIncludeEasyWlan );
-
-
-        /**
-        * @Deprecated
-        * Starts the selector component as a list
-        * Creates dialog(s) from scratch, launches and executes them.
-        * In case of error, leaves with error codes.
-        * @param TUint32 aHighlight The UID of the AP to highlight by default
-        * @param TUint32 aSelected The UID of the AP selected by the user
-        * @return The accomplished task's flag-codes:
-        * <br>
-        * KApUiEventNone,
-        * <br>
-        * KApUiEventSelected,
-        * <br>
-        * KApUiEventCreatedBlank,
-        * <br>
-        * KApUiEventCreatedUsedOld,
-        * <br>
-        * KApUiEventEdited,
-        * <br>
-        * KApUiEventDeleted
-        * <br>
-        * and their combinations. ( Bitwise OR )
-        * <br>
-        * aSelected will be modified only if KApUiEventSelected is included 
-        * in the flags.
-        * <br>
-        * Returns after completion!
-        */
-        void DoRunListSettingsL( TUint32 aHighLight, TUint32& aSelected );
-
-
-        /**
-        * @Deprecated        
-        * Starts the selector component in a setting page
-        * Creates dialog(s) from scratch, launches and executes them.
-        * In case of error, leaves with error codes.
-        * @param TUint32 aHighlight The UID of the AP to highlight by default
-        * @param TUint32 aSelected The UID of the AP selected by the user
-        * @return The accomplished task's flag-codes:
-        * <br>
-        * KApUiEventNone,
-        * <br>
-        * KApUiEventSelected,
-        * <br>
-        * KApUiEventCreatedBlank,
-        * <br>
-        * KApUiEventCreatedUsedOld,
-        * <br>
-        * KApUiEventEdited,
-        * <br>
-        * KApUiEventDeleted
-        * <br>
-        * and their combinations. ( Bitwise OR )
-        * <br>
-        * aSelected will be modified only if KApUiEventSelected is included
-        * in the flags.
-        * <br>
-        * Returns after completion!
-        */
-        void DoRunSetPageSettingsL( TUint32 aHighLight, TUint32& aSelected );
-
-
-        /**
-        * @Deprecated
-        * handles the Create new access Point by using existing one command.
-        * Called after user has selected the AP to copy
-        * Creates the new Ap and offers it for editing.
-        * @param aSelected The UID of the AP to copy. Shall not be KErrNone.
-        * @return The UID of the newly created Ap
-        */
-        TUint32 DoHandleApUseOldNewL( TUint32 aSelected );
-
-        /**
-        * @Deprecated
-        * Selects the Ap to Copy, returns its UID.
-        * If not selected, KErrNone is returned
-        */
-        TUint32 SelectApToCopyL();
-
-
-        /**
-        * @Deprecated
-        * handles the Create blank new access Point command.
-        */
-        TUint32 DoHandleApBlankNewL( TInt aBearers, TInt aIsps );
-
-
-        /**
-        * @Deprecated
-        * handles the Delete network group command.
-        * @param aUid The uid of the network to delete
-        */
-        void HandleNetworkDeleteCmdL( TUint32 aUid );
-
-
-        /**
-        * @Deprecated
-        * Gets the local variant value 
-        * @return A TInt stating the variant
-        */
-        TInt GetVariantL();
-
-
-        /**
-        * @Deprecated
-        * Gets confirmation about deleting an access point
-        * @param aUid A TUint32 holding the WAP access point ID of the 
-        * access point to be deleted.
-        * @param aIsLast A TBool specifying whether the access point to be 
-        * deleted is the last one or not.
-        * @return A TInt stating the result
-        */
-        TInt ConfirmDeleteL( TUint32 aUid, TBool aIsLast );
-
-
-        /**
-        * @Deprecated
-        * Wrapper for the public API
-        */
-        void HandleRunSettingsL( TUint32 aHighLight, TUint32& aSelected );
-        
-
-    protected:  // Functions from base classes
-
-        friend class CApSettingsDlg;
-        friend class CApSelectorDialog;
-        friend class CApSelPopupList;
-        friend class CApNetSelPopupList;
-
-    private:
-        /**
-        * @Deprecated
-        * Selects an appropriate bearer type for a given item according to 
-        * the current filtering criterias
-        * @param aBearers The current bearer filter set
-        * @param aItem The CApAccessPointItem whoose bearer type is to be set.
-        */
-        void ChooseBearerTypeL( TInt aBearers, CApAccessPointItem& aItem );
-
-        /**
-        * @Deprecated
-        * Duplciates an existing access point identified by the passed WAP ID
-        * @param aUid The WAP Access Point ID of the access point to duplicate
-        * @return The WAP Access Point ID of the newly created access point.
-        */
-        TUint32 HandleDuplicateL( TUint32 aUid );
-
-
-    private: //data
-        TBool                   iStartWithSelection;
-        TSelectionListType      iListType;
-        TSelectionMenuType      iSelMenuType;
- 
-        TInt                    iIspFilter;
-        TInt                    iBearerFilter;
-        TApSetHandlerExtra*     iExt;           // Extra data holder structure
-
-        TInt                    iReqIpvType;    // Default is IPv4
-
-// replacing iModel with iImpl, no size change
-//        CApSettingsModel*       iModel;   
-        CApSettingsHandlerImpl* iImpl;          // owned
-        
-        CTextOverrides*         iTextOverrides;
-        TUint32                 iEventStore;    // to hold the events
-        TUid                    iHelpMajor;
-
-#ifdef __TEST_OOMDEBUG
-        TBool                           iMemTestOn;
-#endif // __TEST_OOMDEBUG
-
-    };
-
-#endif
-
-// End of File
--- a/ipcm_pub/connection_monitor_server_api/inc/rconnmon.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/ipcm_pub/connection_monitor_server_api/inc/rconnmon.h	Wed Oct 27 17:51:11 2010 +0300
@@ -1,5 +1,5 @@
 /*
-* Copyright (c) 2002-2009 Nokia Corporation and/or its subsidiary(-ies).
+* Copyright (c) 2002-2010 Nokia Corporation and/or its subsidiary(-ies).
 * All rights reserved.
 * This component and the accompanying materials are made available
 * under the terms of "Eclipse Public License v1.0"
@@ -333,7 +333,8 @@
     EConnMonGetUintAttribute,
     EConnMonGetBoolAttribute,
     EConnMonGetStringAttribute,
-    EConnMonGetPckgAttribute
+    EConnMonGetPckgAttribute,
+    EConnMonSetBoolAttribute,
     };
 
 /**
@@ -477,6 +478,7 @@
     EReqCancelAsyncRequest            = 13,
     EReqReceiveEvent                  = 14,
     EReqCancelReceiveEvent            = 15,
+    EReqSetAsyncBoolAttribute         = 16,
 
     EReqPluginCreateSubSession        = 500,
     EReqPluginCloseSubSession         = 501,
@@ -1738,6 +1740,24 @@
             const TUint aSubConnectionId,
             const TUint aAttribute,
             const TBool aValue ) const;
+    
+    /**
+    * Sets the value for a TBool attribute.
+    *
+    * This method can be used to stop a connection (KConnectionStop).
+    * @param aConnectionId Connection ID.
+    * @param aSubConnectionId Subconnection ID. If set to 0, method applies to
+    * connection.
+    * @param aAttribute Identifies the attribute to be set.
+    * @param aValue The value to be set.
+    * @param aStatus KErrNone if successful, a system-wide error code if not.
+    */            
+    IMPORT_C void SetBoolAttribute(
+            const TUint aConnectionId,
+            const TUint aSubConnectionId,
+            const TUint aAttribute,
+            const TBool aValue,
+            TRequestStatus& aStatus ) const;
 
     /**
     * Sets the value for a string attribute.
--- a/ipcm_pub/connection_settings_api/inc/cmconnectionmethoddef.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/ipcm_pub/connection_settings_api/inc/cmconnectionmethoddef.h	Wed Oct 27 17:51:11 2010 +0300
@@ -159,16 +159,15 @@
         * These are not bearer specific, but controling attributes.
         */
         ECmInvalidAttribute = 400,  /**<
-                                    * Client application can check which attribute
-                                    * was incorrect in UpdateL().
+                                    * @deprecated
+                                    * Always leaves with error code KErrNotSupported.
                                     * (TUint32 - default: none - read only)
                                     */
 
         ECmLoadResult = 402,        /**<
-                                    * Result of the load process. KErrNone if there
-                                    * was no error. Otherwise a system wide
-                                    * error code.
-                                    * (TUint32 - default: KErrNone - read only)
+                                    * @deprecated
+                                    * Always leaves with error code KErrNotSupported.
+                                    * (TUint32 - default: KErrNotSupported - read only)
                                     */
 
         /**
--- a/ipcm_pub/connection_settings_api/inc/cmdestination.h	Wed Oct 27 17:43:56 2010 +0300
+++ b/ipcm_pub/connection_settings_api/inc/cmdestination.h	Wed Oct 27 17:51:11 2010 +0300
@@ -201,6 +201,10 @@
 
         /**
         * Embeds an existing destination into this destination.
+        * A destination can only hold one embedded destination.
+        * Trying to add a second one will fail with KErrNotSupported.
+        * Also, an already embedded destination can't contain an embedded
+        * destination itself, preventing chains of three destinations or more.
         * @param RCmDestination - Destination to be embedded
         * @return TInt - index in the Connection Method list
         */
--- a/ipcm_pub/group/bld.inf	Wed Oct 27 17:43:56 2010 +0300
+++ b/ipcm_pub/group/bld.inf	Wed Oct 27 17:51:11 2010 +0300
@@ -17,8 +17,6 @@
 */
 
 #include "../connection_settings_api/group/bld.inf"
-#include "../access_point_engine_api/group/bld.inf"
-#include "../access_point_settings_handler_api/group/bld.inf"
 #include "../data_connection_log_counters_api/group/bld.inf"
 #include "../connection_monitor_server_api/group/bld.inf"
 #include "../connection_settings_ui_api/group/bld.inf"
--- a/package_definition.xml	Wed Oct 27 17:43:56 2010 +0300
+++ b/package_definition.xml	Wed Oct 27 17:51:11 2010 +0300
@@ -5,10 +5,6 @@
    <component id="ipcm_plat_qt_build" name="IP Connectivity Management Qt Platform Interfaces" class="api" filter="s60" introduced="^4">
     <unit bldFile="ipcm_plat" qt:proFile="ipcm_plat.pro"/>
    </component>
-   <component id="access_point_engine_misc_api" name="Access Point Engine Misc API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_plat/access_point_engine_misc_api/access_point_engine_misc_api.metaxml"/>
-    <unit bldFile="ipcm_plat/access_point_engine_misc_api/group"/>
-   </component>
    <component id="bearer_settings_plugin_api" name="Bearer Settings Plugin API" class="api" filter="s60">
     <meta rel="Api" href="ipcm_plat/bearer_settings_plugin_api/bearer_settings_plugin_api.metaxml"/>
     <unit bldFile="ipcm_plat/bearer_settings_plugin_api/group"/>
@@ -61,14 +57,6 @@
     <meta rel="Api" href="ipcm_pub/connection_settings_api/connection_settings_api.metaxml"/>
     <unit bldFile="ipcm_pub/connection_settings_api/group"/>
    </component>
-   <component id="access_point_engine_api" name="Access Point Engine API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_pub/access_point_engine_api/access_point_engine_api.metaxml"/>
-    <unit bldFile="ipcm_pub/access_point_engine_api/group"/>
-   </component>
-   <component id="access_point_settings_handler_api" name="Access Point Settings Handler API" class="api" filter="s60">
-    <meta rel="Api" href="ipcm_pub/access_point_settings_handler_api/access_point_settings_handler_api.metaxml"/>
-    <unit bldFile="ipcm_pub/access_point_settings_handler_api/group"/>
-   </component>
    <component id="data_connection_log_counters_api" name="Data Connection Log Counters API" class="api" filter="s60">
     <meta rel="Api" href="ipcm_pub/data_connection_log_counters_api/data_connection_log_counters_api.metaxml"/>
     <unit bldFile="ipcm_pub/data_connection_log_counters_api/group"/>
@@ -95,14 +83,6 @@
     <unit bldFile="alwayson_net_plugin/pdpcontextmanager2/group"/>
    </component>
   </collection>
-  <collection id="apengine" name="Access Point Engine" level="framework">
-   <component id="apeng" filter="s60" name="Access Point Engine">
-    <unit bldFile="apengine/apeng/group"/>
-   </component>
-   <component id="apsettingshandlerui" filter="s60" name="Access Point Settings Handler UI">
-    <unit bldFile="apengine/apsettingshandlerui/group"/>
-   </component>
-  </collection>
   <collection id="bearermanagement" name="Bearer Management" level="framework">
    <component id="mpm" filter="s60" name="Mobility Policy Manager">
     <unit bldFile="bearermanagement/mpm/group"/>